Merge lp:~jamesodhunt/auto-package-testing/partial-fix-for-bug-1075976 into lp:auto-package-testing

[James Hunt]

  * bin/run-adt-test: add --no-eat option (which is passed to run-adt).
  * bin/testbed/run-adt: Add --no-eat option to disable eatmydata,
    to reinstate normal data integrity behaviour
    (atleast partially fixes LP bug 1075976).

[Martin Pitt (pitti)]

As discussed on IRC, I merged the typo fixes. The --no-eat doesn't seem relevant, so I left those parts out.

Thanks!

review: Approve

=== modified file 'bin/run-adt-test'
--- bin/run-adt-test	2012-11-07 12:39:36 +0000
+++ bin/run-adt-test	2012-11-08 16:11:29 +0000
@@ -76,6 +76,8 @@
   -s,--use-shm Write snapshot files to /dev/shm
   -S,--source  Run from source instead of dsc
   -d,--debug   Enable debug mode
+  -e,--no-eat  Do not use eatmydata when running tests
+               (use when tests require data integrity).
   -P,--proposed 
                Enable -proposed in testbed
   -p,--ppa     Include a PPA to search packages
@@ -88,7 +90,7 @@
 }
 
 
-TEMP=$(getopt -o ha:b:r:p:PdklsS --long help,arch:,bzr:,release:,ppa:,proposed,debug,keep,login,use-shm,source -- "$@")
+TEMP=$(getopt -o eha:b:r:p:PdklsS --long help,arch:,bzr:,release:,ppa:,no-eat,proposed,debug,keep,login,use-shm,source -- "$@")
 eval set -- "$TEMP"
 
 exec 2>&1
@@ -126,6 +128,9 @@
             set -x
             RUN_OPTS="$RUN_OPTS -d"
             shift;;
+        -e|--no-eat)
+            RUN_OPTS="$RUN_OPTS --no-eat"
+            shift;;
         -k|--keep)
             KEEP=1
             trap - EXIT INT
 
=== modified file 'bin/testbed/run-adt'
--- bin/testbed/run-adt	2012-10-29 10:05:21 +0000
+++ bin/testbed/run-adt	2012-11-08 16:11:29 +0000
@@ -25,6 +25,7 @@
 USE_SOURCE=0
 USE_PROPOSED=0
 DONT_RUN=0
+USE_EATMYDATA=1
 BRANCH=""
 
 RET=0
@@ -38,6 +39,8 @@
   -b,--bzr BRANCH    Use bazaar branch BRANCH. It cannot be used
                      simultaneouslty with -S
   -d,--debug         Enable debug mode
+  -e,--no-eat        Do not use eatmydata when running tests
+                     (use when tests require data integrity).
   -n,--no-run        Do not run, just initialize the environment
   -o,--logdir DIR    Log directory (default:$ADTLOG_PATH)
   -p,--ppa PPA       Include a PPA to search packages
@@ -47,7 +50,7 @@
     exit 1
 }
 
-TEMP=$(getopt -o hb:do:np:PS --long help,bzr:,debug,logdir:,no-run,ppa:,proposed,source -- "$@")
+TEMP=$(getopt -o ehb:do:np:PS --long help,bzr:,debug,logdir:,no-run,no-eat,ppa:,proposed,source -- "$@")
 eval set -- "$TEMP"
 
 exec 2>&1
@@ -69,6 +72,9 @@
         -p|--ppa)
             PPA=$2
             shift 2;;
+        -e|--no-eat)
+            USE_EATMYDATA=0
+            shift;;
         -n|--no-run)
             DONT_RUN=1
             shift;;
@@ -98,7 +104,11 @@
 locale-gen en_US.UTF-8
 
 export DEBIAN_FRONTEND=noninteractive
-export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libeatmydata/libeatmydata.so"
+
+if [ "$USE_EATMYDATA" -eq 1 ]
+then
+    export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libeatmydata/libeatmydata.so"
+fi
 
 if [ $USE_PROPOSED -eq 1 ]; then
     release=$( lsb_release -cs )
 
=== modified file 'doc/README.md'
--- doc/README.md	2012-10-29 10:03:06 +0000
+++ doc/README.md	2012-11-08 16:11:29 +0000
@@ -16,7 +16,7 @@
  * trigger-adt-test: Check periodically the changes in the archive and trigger
 the tests.
 
-The project on Lauchpach is https://launchpad.net/auto-package-testing
+The project on Launchpad is https://launchpad.net/auto-package-testing
 
 DEP8 documentation:
 
 
=== modified file 'doc/USAGE.md'
--- doc/USAGE.md	2012-10-26 13:01:35 +0000
+++ doc/USAGE.md	2012-11-08 16:11:29 +0000
@@ -90,7 +90,7 @@
 failures, the following command will start the testbed and prepare it so you can
 run adt-run directly:
 
-    $ ./bin/run-adt-test -r quantal -a amd64 -S l apport
+    $ ./bin/run-adt-test -r quantal -a amd64 -S -l apport
 
  * -S will install the sources of apport
  * -l will log you in
@@ -100,6 +100,6 @@
     $ cd apport*
     $ sudo adt-run --unbuilt-tree . --- adt-virt-null
 
-Be careful to copy your work outside of the testbed before existing, as the
+Be careful to copy your work outside of the testbed before exiting, as the
 testbed will be destroyed on exit. You can keep the testbed after the run with
 the option '-k'.