diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2018-03-19 15:35:07 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2018-03-19 15:35:18 +0300 |
| commit | 302739e70cdf9495e738a95ee65f4f46ea6ec438 (patch) | |
| tree | d29a9a5423bbc4a3fbf71f877b8346d33b772eb7 | |
| parent | 1fae30f8e1af4b4b5d15e8bbd692968837d3e7fd (diff) | |
Make use of cp builtin -p option
| -rw-r--r-- | tests/config.test | 4 | ||||
| -rw-r--r-- | tests/pkg-build.test | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/tests/config.test b/tests/config.test index c40d24b..0050fb3 100644 --- a/tests/config.test +++ b/tests/config.test @@ -15,12 +15,12 @@ # The most commonly used configuration cloning command that copies it from the # parent scope working directory. # -clone_cfg = cp -r ../cfg ./ +clone_cfg = cp -p -r ../cfg ./ # Clones the original (presumably empty) configuration from the root scope # working directory. # -clone_root_cfg = cp -r $~/cfg ./ +clone_root_cfg = cp -p -r $~/cfg ./ # Setup a test command to use a cloned configuration directory by default. # diff --git a/tests/pkg-build.test b/tests/pkg-build.test index f57d51d..d6e3db0 100644 --- a/tests/pkg-build.test +++ b/tests/pkg-build.test @@ -1549,9 +1549,6 @@ rep_fetch += -d cfg --auth all --trust-yes 2>! +$clone_cfg - # @@ Uncomment the following tests when -p option is supported for the cp - # builtin. - #\ : dir-repo : : Test that libhello is built incrementally. May re-link due to the @@ -1619,7 +1616,6 @@ rep_fetch += -d cfg --auth all --trust-yes 2>! test -d cfg/libhello-1.0.1/ == 1 } } - #\ : archive : @@ -1631,7 +1627,7 @@ rep_fetch += -d cfg --auth all --trust-yes 2>! : if ($cxx.target.class != 'windows') { - clone_cfg = cp --no-cleanup -r ../../cfg ./ + clone_cfg = cp -p --no-cleanup -r ../../cfg ./ +$build 'dist(../../libhello/@./out/)' \ "config.cxx=$config.cxx" config.dist.root=./ \ @@ -1721,7 +1717,7 @@ rep_fetch += -d cfg --auth all --trust-yes 2>! updated libfoo/1.1.0 EOE - cp -r $src/libfoo-1.1.0 libfoo; + cp -p -r $src/libfoo-1.1.0 libfoo; $* libfoo/ 2>>~%EOE%; disfigured libfoo/1.1.0 |