diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/add-filename-check.test | 3 | ||||
| -rw-r--r-- | test/comments.test | 3 | ||||
| -rw-r--r-- | test/conflicts.test | 2 | ||||
| -rw-r--r-- | test/create-delete.test | 2 | ||||
| -rw-r--r-- | test/delete.test | 2 | ||||
| -rw-r--r-- | test/dotglob.test | 2 | ||||
| -rw-r--r-- | test/example1.test | 2 | ||||
| -rw-r--r-- | test/failpop.test | 2 | ||||
| -rw-r--r-- | test/fold.test | 3 | ||||
| -rw-r--r-- | test/formats.test | 2 | ||||
| -rw-r--r-- | test/header.test | 2 | ||||
| -rw-r--r-- | test/merge.test | 3 | ||||
| -rw-r--r-- | test/missing.test | 3 | ||||
| -rw-r--r-- | test/new-nosubdir.test | 4 | ||||
| -rw-r--r-- | test/one.test | 2 | ||||
| -rw-r--r-- | test/perms.test | 2 | ||||
| -rw-r--r-- | test/remove2.test | 2 | ||||
| -rw-r--r-- | test/rename.test | 2 | ||||
| -rw-r--r-- | test/reorder.test | 3 | ||||
| -rw-r--r-- | test/snapshot.test | 2 | ||||
| -rw-r--r-- | test/snapshot2.test | 2 | ||||
| -rw-r--r-- | test/sort.test | 2 | ||||
| -rw-r--r-- | test/subdir.test | 2 | ||||
| -rw-r--r-- | test/trailing-ws.test | 2 | ||||
| -rw-r--r-- | test/two.test | 2 |
25 files changed, 26 insertions, 32 deletions
diff --git a/test/add-filename-check.test b/test/add-filename-check.test index b056d74..9a26a53 100644 --- a/test/add-filename-check.test +++ b/test/add-filename-check.test @@ -1,6 +1,5 @@ -$ mkdir d +$ mkdir -p d/patches $ cd d -$ mkdir patches $ quilt new test.diff >Patch patches/test.diff is now on top diff --git a/test/comments.test b/test/comments.test index a4b8d99..d5e58fc 100644 --- a/test/comments.test +++ b/test/comments.test @@ -1,9 +1,8 @@ Regresion test case: Empty lines in patch descriptions were accidentally removed. - $ mkdir d + $ mkdir -p d/patches $ cd d - $ mkdir patches $ echo one > f $ cat > patches/test.diff < C1 diff --git a/test/conflicts.test b/test/conflicts.test index 99aed92..2188bfc 100644 --- a/test/conflicts.test +++ b/test/conflicts.test @@ -2,7 +2,7 @@ This test case creates a patch and then applies that patch to a modified source file. The source file is modified until the patch doesn't apply anymore, then the patch is fixed. - $ mkdir d + $ mkdir -p d/patches $ cd d $ cat > one.txt diff --git a/test/create-delete.test b/test/create-delete.test index 29694d2..5bdf9d6 100644 --- a/test/create-delete.test +++ b/test/create-delete.test @@ -1,7 +1,7 @@ Check whether quilt generates patches properly so that GNU patch recognizes file creates and deletions. - $ mkdir d + $ mkdir -p d/patches $ cd d $ echo delete > delete diff --git a/test/delete.test b/test/delete.test index 25f3185..da863e4 100644 --- a/test/delete.test +++ b/test/delete.test @@ -1,6 +1,6 @@ Test the delete command. - $ mkdir d + $ mkdir -p d/patches $ cd d $ cat > test.txt diff --git a/test/dotglob.test b/test/dotglob.test index 11c93dd..b892bdb 100644 --- a/test/dotglob.test +++ b/test/dotglob.test @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ quilt new dotglob.diff diff --git a/test/example1.test b/test/example1.test index 01eca82..e7efbb4 100644 --- a/test/example1.test +++ b/test/example1.test @@ -1,7 +1,7 @@ The text used here was taken from: http://the-tech.mit.edu/Shakespeare/midsummer/full.html - $ mkdir example1 + $ mkdir -p example1/patches $ cd example1 $ cat > Oberon.txt < Yet mark'd I where the bolt of Cupid fell: diff --git a/test/failpop.test b/test/failpop.test index 9c6df53..f921977 100644 --- a/test/failpop.test +++ b/test/failpop.test @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ cat > test.txt diff --git a/test/fold.test b/test/fold.test index bae1cef..5883b6e 100644 --- a/test/fold.test +++ b/test/fold.test @@ -1,7 +1,6 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d - $ mkdir patches $ cat > patches/series < patch1.diff diff --git a/test/formats.test b/test/formats.test index af8ad4d..aa9931e 100644 --- a/test/formats.test +++ b/test/formats.test @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ cat > test.txt diff --git a/test/header.test b/test/header.test index 371e017..3d89d97 100644 --- a/test/header.test +++ b/test/header.test @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ echo foo > foo diff --git a/test/merge.test b/test/merge.test index aaa9da8..5d2deb5 100644 --- a/test/merge.test +++ b/test/merge.test @@ -1,6 +1,6 @@ Test the patch merging functionality of `quilt diff'. - $ mkdir d + $ mkdir -p d/patches $ cd d $ cat > abc.txt @@ -8,7 +8,6 @@ Test the patch merging functionality of `quilt diff'. < b < c - $ mkdir patches $ cat > patches/series < a.diff < b.diff diff --git a/test/missing.test b/test/missing.test index 8c1e827..5361dad 100644 --- a/test/missing.test +++ b/test/missing.test @@ -1,7 +1,6 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d - $ mkdir patches $ cat > patches/series < missing1.diff < missing2.diff diff --git a/test/new-nosubdir.test b/test/new-nosubdir.test index 97d8e98..e5826b4 100644 --- a/test/new-nosubdir.test +++ b/test/new-nosubdir.test @@ -1,7 +1,7 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d - $ mkdir patches sub + $ mkdir sub $ cd sub $ quilt new here.diff > Patch %{_P}here.diff is now on top diff --git a/test/one.test b/test/one.test index 6cf809e..ca5d33b 100644 --- a/test/one.test +++ b/test/one.test @@ -5,7 +5,7 @@ of the installed quilt with `make check'. (To run, type `./run one.test' in this directory.) - $ mkdir d + $ mkdir -p d/patches $ cd d $ mkdir dir $ echo "This is file one." > dir/file1 diff --git a/test/perms.test b/test/perms.test index d592e14..4b56f2d 100644 --- a/test/perms.test +++ b/test/perms.test @@ -1,5 +1,5 @@ $ umask 022 - $ mkdir d + $ mkdir -p d/patches $ cd d $ echo foo > foo $ chmod 704 foo diff --git a/test/remove2.test b/test/remove2.test index d2a8005..a7a5882 100644 --- a/test/remove2.test +++ b/test/remove2.test @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ quilt new remove.patch diff --git a/test/rename.test b/test/rename.test index 9ed794b..4478a52 100644 --- a/test/rename.test +++ b/test/rename.test @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ cat > announce.txt diff --git a/test/reorder.test b/test/reorder.test index 9fbb12d..7bf8c3e 100644 --- a/test/reorder.test +++ b/test/reorder.test @@ -1,10 +1,9 @@ Regression test: Quilt did reorder files in patches. - $ mkdir d + $ mkdir -p d/patches $ cd d $ echo one > f $ echo one > g - $ mkdir patches $ cat > patches/test.diff < --- g.orig < +++ g diff --git a/test/snapshot.test b/test/snapshot.test index 9d8dce9..5acf487 100644 --- a/test/snapshot.test +++ b/test/snapshot.test @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ quilt new snapshot diff --git a/test/snapshot2.test b/test/snapshot2.test index a0ea9e4..fc9462c 100644 --- a/test/snapshot2.test +++ b/test/snapshot2.test @@ -1,4 +1,4 @@ - $ mkdir -p d/d + $ mkdir -p d/patches d/d $ cd d $ quilt new snapshot > Patch %{P}snapshot is now on top diff --git a/test/sort.test b/test/sort.test index 6d3868a..20cc59d 100644 --- a/test/sort.test +++ b/test/sort.test @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ quilt new sort.diff diff --git a/test/subdir.test b/test/subdir.test index a627a43..106c1c5 100644 --- a/test/subdir.test +++ b/test/subdir.test @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ mkdir subdir diff --git a/test/trailing-ws.test b/test/trailing-ws.test index 2053062..84b716c 100644 --- a/test/trailing-ws.test +++ b/test/trailing-ws.test @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ cat > a diff --git a/test/two.test b/test/two.test index 445942b..7f51345 100644 --- a/test/two.test +++ b/test/two.test @@ -1,6 +1,6 @@ (To run, type `./run two.test' in this directory.) - $ mkdir -p d/d + $ mkdir -p d/patches d/d $ cd d $ quilt new patch1.diff > Patch %{P}patch1.diff is now on top |