diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cfg-create.testscript | 6 | ||||
| -rw-r--r-- | tests/pkg-build.testscript | 12 | ||||
| -rw-r--r-- | tests/pkg-clean.testscript | 2 | ||||
| -rw-r--r-- | tests/pkg-configure.testscript | 2 | ||||
| -rw-r--r-- | tests/pkg-update.testscript | 2 |
5 files changed, 14 insertions, 10 deletions
diff --git a/tests/cfg-create.testscript b/tests/cfg-create.testscript index 68aea13..8d7f95e 100644 --- a/tests/cfg-create.testscript +++ b/tests/cfg-create.testscript @@ -4,6 +4,8 @@ .include common.testscript +config_cxx = config.cxx=$quote($recall($cxx.path) $cxx.mode, true) + pkg_status += -d cfg : non-empty @@ -48,7 +50,7 @@ EOE : module : { - $* cxx "config.cxx=$config.cxx" 2>>/~%EOE%; + $* cxx $config_cxx 2>>/~%EOE%; %created new configuration in .+/cfg/% EOE @@ -76,7 +78,7 @@ EOE : existing : { - $build 'create(cfg/,cc)' "config.cxx=$config.cxx" 2>!; + $build 'create(cfg/,cc)' $config_cxx 2>!; $* --existing 2>>/~%EOE%; %initialized existing configuration in .+/cfg/% diff --git a/tests/pkg-build.testscript b/tests/pkg-build.testscript index 6ce1689..cf9c82c 100644 --- a/tests/pkg-build.testscript +++ b/tests/pkg-build.testscript @@ -146,7 +146,9 @@ $git_extract $src/git/libbaz.tar &$out_git/state1/*** end -pkg_configure += -d cfg "config.cxx=$config.cxx" 2>! +config_cxx = config.cxx=$quote($recall($cxx.path) $cxx.mode, true) + +pkg_configure += -d cfg $config_cxx 2>! pkg_disfigure += -d cfg pkg_drop += -d cfg --yes 2>! pkg_fetch += -d cfg 2>! @@ -2288,7 +2290,7 @@ test.options += --no-progress : as a dependency, so it is built incrementally. : { - $cfg_create cxx "config.cxx=$config.cxx" -d cfg 2>- &cfg/***; + $cfg_create cxx $config_cxx -d cfg 2>- &cfg/***; # Add libhello as the dir repository. # @@ -2800,7 +2802,7 @@ test.options += --no-progress { test.arguments += --yes - +$cfg_create cxx "config.cxx=$config.cxx" -d cfg 2>- &cfg/*** + +$cfg_create cxx $config_cxx -d cfg 2>- &cfg/*** +cp -r $src/libhello-1.0.0 ./libhello +$rep_add libhello --type dir +$rep_fetch @@ -3368,7 +3370,7 @@ test.options += --no-progress : keep-out : { - +$cfg_create cxx "config.cxx=$config.cxx" -d cfg 2>- &cfg/*** + +$cfg_create cxx $config_cxx -d cfg 2>- &cfg/*** # Build libhello as an external package. # @@ -3484,7 +3486,7 @@ test.options += --no-progress clone_cfg = cp -pr --no-cleanup ../../cfg ./ +$build 'dist(../../libhello/@./out/)' \ - "config.cxx=$config.cxx" config.dist.root=./ \ + $config_cxx config.dist.root=./ \ config.dist.archives=tar.gz 2>! \ &libhello-1.0.1/*** &libhello-1.0.1.tar.gz diff --git a/tests/pkg-clean.testscript b/tests/pkg-clean.testscript index a74b7f0..944f98c 100644 --- a/tests/pkg-clean.testscript +++ b/tests/pkg-clean.testscript @@ -48,7 +48,7 @@ &$out/hello/signature.manifest end -pkg_configure += -d cfg "config.cxx=$config.cxx" 2>! +pkg_configure += -d cfg config.cxx=$quote($recall($cxx.path) $cxx.mode, true) 2>! pkg_disfigure += -d cfg pkg_fetch += -d cfg 2>! pkg_purge += -d cfg diff --git a/tests/pkg-configure.testscript b/tests/pkg-configure.testscript index 00963dc..cab52fa 100644 --- a/tests/pkg-configure.testscript +++ b/tests/pkg-configure.testscript @@ -66,7 +66,7 @@ $rep_create $out/stable &$out/stable/packages.manifest end -test.arguments += "config.cxx=$config.cxx" +test.arguments += config.cxx=$quote($recall($cxx.path) $cxx.mode, true) pkg_disfigure += -d cfg pkg_fetch += -d cfg 2>! diff --git a/tests/pkg-update.testscript b/tests/pkg-update.testscript index 9c6aaea..9a1cf7d 100644 --- a/tests/pkg-update.testscript +++ b/tests/pkg-update.testscript @@ -48,7 +48,7 @@ &$out/hello/signature.manifest end -pkg_configure += -d cfg "config.cxx=$config.cxx" 2>! +pkg_configure += -d cfg config.cxx=$quote($recall($cxx.path) $cxx.mode, true) 2>! pkg_disfigure += -d cfg pkg_fetch += -d cfg 2>! pkg_purge += -d cfg |