diff options
| author | Jean Delvare <jdelvare@suse.de> | 2010-01-23 21:23:01 +0100 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2010-01-23 21:23:01 +0100 |
| commit | f1458bf10fe56cb4f95f446bf35bcd09a55f6ecd (patch) | |
| tree | 5fe723da550a121f8556e7bd136d4f58d0ecf374 /test/two.test | |
| parent | b321567c52c9877a1532bf86f328f13620b06c7b (diff) | |
| download | quilt-f1458bf10fe56cb4f95f446bf35bcd09a55f6ecd.tar.gz | |
Separate working directory for each test case
Let the test suite runner script create a separate working
directory for each test. This makes it possible to run several
tests in parallel, speeding up testing on SMP systems. It also
ensures that a broken test case can no longer cause another test
case to fail.
At this point, it is possible to run the test suite in parallel,
the final result (success or failure) will be correct, however
the output is hardly readable because the progress of all tests
are interlaced. This will be improved later.
As a nice side effect, this means we can drop the setup and
clean-up steps that were present in all test cases.
Diffstat (limited to 'test/two.test')
| -rw-r--r-- | test/two.test | 50 |
1 files changed, 23 insertions, 27 deletions
diff --git a/test/two.test b/test/two.test index 5770724..10588a1 100644 --- a/test/two.test +++ b/test/two.test @@ -1,8 +1,7 @@ (To run, type `./run two.test' in this directory.) - $ rm -rf d - $ mkdir -p d/patches d/d - $ cd d + $ mkdir patches d + $ quilt new patch1.diff > Patch %{P}patch1.diff is now on top @@ -21,19 +20,19 @@ > Nothing in patch %{_P}patch1.diff $ echo "This is file two." > file2 - $ quilt diff - > Index: d/d/file2 + $ quilt diff -p ab + > Index: b/d/file2 > =================================================================== > --- /dev/null - > +++ d/d/file2 + > +++ b/d/file2 > @@ -0,0 +1 @@ > +This is file two. - $ quilt diff -z - > Index: d/d/file2 + $ quilt diff -z -p ab + > Index: b/d/file2 > =================================================================== > --- /dev/null - > +++ d/d/file2 + > +++ b/d/file2 > @@ -0,0 +1 @@ > +This is file two. @@ -42,21 +41,21 @@ $ quilt diff -z $ echo "Another line has been added." >> dir/file1 - $ quilt diff -z - > Index: d/d/dir/file1 + $ quilt diff -z -p ab + > Index: b/d/dir/file1 > =================================================================== - > --- d.orig/d/dir/file1 - > +++ d/d/dir/file1 + > --- a/d/dir/file1 + > +++ b/d/dir/file1 > @@ -1 +1,2 @@ > This is file one. > +Another line has been added. $ cd dir - $ quilt diff -z file1 - > Index: d/d/dir/file1 + $ quilt diff -z file1 -p ab + > Index: b/d/dir/file1 > =================================================================== - > --- d.orig/d/dir/file1 - > +++ d/d/dir/file1 + > --- a/d/dir/file1 + > +++ b/d/dir/file1 > @@ -1 +1,2 @@ > This is file one. > +Another line has been added. @@ -109,10 +108,10 @@ > File d/file4 added to patch %{_P}subdir/patch3.diff $ rm -f file4 - $ quilt diff - > Index: d/d/file4 + $ quilt diff -p ab + > Index: b/d/file4 > =================================================================== - > --- d.orig/d/file4 + > --- a/d/file4 > +++ /dev/null > @@ -1 +0,0 @@ > -This is file 4. @@ -128,11 +127,11 @@ > Refreshed patch %{_P}patch2.diff $ echo "Another line added." >> file2 - $ quilt diff -z -P patch1 - > Index: d/d/file2 + $ quilt diff -z -P patch1 -p ab + > Index: b/d/file2 > =================================================================== - > --- d.orig/d/file2 - > +++ d/d/file2 + > --- a/d/file2 + > +++ b/d/file2 > @@ -1 +1,2 @@ > This is file two. > +Another line added. @@ -158,6 +157,3 @@ > Removing patch %{_P}patch2.diff > Removing patch %{_P}patch1.diff > No patches applied - - $ cd ../.. - $ rm -rf d |