diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/pkg-fetch.test | 2 | ||||
| -rw-r--r-- | tests/pkg-purge.test | 13 | ||||
| -rw-r--r-- | tests/pkg-unpack.test | 7 |
3 files changed, 6 insertions, 16 deletions
diff --git a/tests/pkg-fetch.test b/tests/pkg-fetch.test index 85afedb..3d5b40b 100644 --- a/tests/pkg-fetch.test +++ b/tests/pkg-fetch.test @@ -175,7 +175,7 @@ $* libfoo/1.0.0 2>>/EOE != 0 : { $clone_cfg; - cp $src/t1/libfoo-1.0.0.tar.gz ./ &!libfoo-1.0.0.tar.gz; + cp --no-cleanup $src/t1/libfoo-1.0.0.tar.gz ./; $* -p -e libfoo-1.0.0.tar.gz 2>'fetched libfoo/1.0.0'; diff --git a/tests/pkg-purge.test b/tests/pkg-purge.test index 1c2bff6..6185665 100644 --- a/tests/pkg-purge.test +++ b/tests/pkg-purge.test @@ -56,7 +56,7 @@ $* libfoo 2>>/EOE != 0 : { $clone_cfg; - cp $src/libfoo-1.0.0.tar.gz cfg/ &!cfg/libfoo-1.0.0.tar.gz; + cp --no-cleanup $src/libfoo-1.0.0.tar.gz cfg/; $pkg_fetch -e -p cfg/libfoo-1.0.0.tar.gz; $* libfoo 2>'purged libfoo/1.0.0'; @@ -114,12 +114,7 @@ $* libfoo 2>>/EOE != 0 : { $clone_cfg; - - # @@ Use --no-cleanup for cp builtin when implemented. - # - d = &!cfg/libfoo-1.1.0/; - c = $d/ $d/build/ $d/build/bootstrap.build $d/buildfile $d/manifest; - cp -r $src/libfoo-1.1.0 cfg/ $c; + cp --no-cleanup -r $src/libfoo-1.1.0 cfg/; $pkg_unpack -e -p cfg/libfoo-1.1.0; @@ -132,7 +127,7 @@ $* libfoo 2>>/EOE != 0 : { $clone_cfg; - cp $src/libfoo-1.0.0.tar.gz cfg/ &!cfg/libfoo-1.0.0.tar.gz; + cp --no-cleanup $src/libfoo-1.0.0.tar.gz cfg/; $pkg_fetch -e -p cfg/libfoo-1.0.0.tar.gz && $pkg_unpack libfoo; $* libfoo 2>'purged libfoo/1.0.0'; @@ -146,7 +141,7 @@ $* libfoo 2>>/EOE != 0 if ($cxx.target.class != 'windows') { $clone_cfg; - cp $src/libfoo-1.0.0.tar.gz cfg/ &!cfg/libfoo-1.0.0.tar.gz; + cp --no-cleanup $src/libfoo-1.0.0.tar.gz cfg/; $pkg_fetch -e -p cfg/libfoo-1.0.0.tar.gz; $pkg_unpack libfoo; chmod 000 cfg/libfoo-1.0.0; diff --git a/tests/pkg-unpack.test b/tests/pkg-unpack.test index 337c939..83fa9a6 100644 --- a/tests/pkg-unpack.test +++ b/tests/pkg-unpack.test @@ -173,12 +173,7 @@ $* 2>>EOE != 0 : { $clone_cfg; - - # @@ Use --no-cleanup for cp builtin when implemented. - # - d = &!libfoo-1.1.0/; - c = $d/ $d/build/ $d/build/bootstrap.build $d/buildfile $d/manifest; - cp -r $src/libfoo-1.1.0 ./ $c; + cp --no-cleanup -r $src/libfoo-1.1.0 ./; $* -p -e libfoo-1.1.0 2>'unpacked libfoo/1.1.0'; |