diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2019-10-18 18:45:54 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-10-18 18:45:54 +0300 |
| commit | 23dfd50930bfe3d7135a567e7c67eea21aeece98 (patch) | |
| tree | 3c0f701f4a76870a452e069e7e1fe53c299e230f /tests/pkg-build.testscript | |
| parent | b3bfef53ee45f0ed5cc2293d7e60f0796fd7e95e (diff) | |
Use $quote() for quoting config.cxx option value in testscripts
Diffstat (limited to 'tests/pkg-build.testscript')
| -rw-r--r-- | tests/pkg-build.testscript | 12 |
1 files changed, 7 insertions, 5 deletions
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 |