diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2019-10-16 07:14:43 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2019-10-16 07:20:06 +0200 |
| commit | eeed5341570e88ff494634198c77b54f3595a684 (patch) | |
| tree | 628e342d4867eecb079822907b24447051d6e68b | |
| parent | 5529cbd7dbe364410ecdd132ac5f24cda0846121 (diff) | |
Quote config.{c,cxx} paths when passing to tests
Without this Windows directory separators are treated as escapes.
| -rw-r--r-- | tests/ci.testscript | 2 | ||||
| -rw-r--r-- | tests/common.testscript | 2 | ||||
| -rw-r--r-- | tests/config.testscript | 2 | ||||
| -rw-r--r-- | tests/fetch.testscript | 2 | ||||
| -rw-r--r-- | tests/init.testscript | 2 | ||||
| -rw-r--r-- | tests/new.testscript | 4 | ||||
| -rw-r--r-- | tests/publish.testscript | 2 | ||||
| -rw-r--r-- | tests/status.testscript | 2 | ||||
| -rw-r--r-- | tests/sync.testscript | 2 | ||||
| -rw-r--r-- | tests/test.testscript | 4 | ||||
| -rw-r--r-- | tests/update.testscript | 2 |
11 files changed, 14 insertions, 12 deletions
diff --git a/tests/ci.testscript b/tests/ci.testscript index 7b7e180..b56b4eb 100644 --- a/tests/ci.testscript +++ b/tests/ci.testscript @@ -52,7 +52,7 @@ repository='http://example.com/prj.git' test.arguments += --yes --repository "$repository" --server "$server" \ --simulate 'success' -cxx = cc config.cxx="$recall($cxx.path)" +cxx = cc config.cxx="'$recall($cxx.path)'" new += 2>! init += $cxx -d prj 2>! &prj/**/bootstrap/*** diff --git a/tests/common.testscript b/tests/common.testscript index 2340491..bee2cee 100644 --- a/tests/common.testscript +++ b/tests/common.testscript @@ -17,6 +17,8 @@ build = $recall($build.path) # Disable loading the user's default options files (that may affect the test # commands execution) for bdep, bpkg, and build2. # +# @@ Quote paths similar to config.cxx (how does it even work on Windows)? +# options_guard = $~/.build2 +mkdir $options_guard diff --git a/tests/config.testscript b/tests/config.testscript index 6147756..11ec4ef 100644 --- a/tests/config.testscript +++ b/tests/config.testscript @@ -7,7 +7,7 @@ .include common.testscript project.testscript -cxx = cc config.cxx="$recall($cxx.path)" +cxx = cc config.cxx="'$recall($cxx.path)'" status += -d prj init += -d prj diff --git a/tests/fetch.testscript b/tests/fetch.testscript index 9d5ad18..6e4645b 100644 --- a/tests/fetch.testscript +++ b/tests/fetch.testscript @@ -4,7 +4,7 @@ .include common.testscript project.testscript -cxx = cc config.cxx="$recall($cxx.path)" +cxx = cc config.cxx="'$recall($cxx.path)'" new += 2>! init += $cxx -d prj 2>! diff --git a/tests/init.testscript b/tests/init.testscript index 723ba04..ccc1775 100644 --- a/tests/init.testscript +++ b/tests/init.testscript @@ -7,7 +7,7 @@ .include common.testscript project.testscript -cxx = cc config.cxx="$recall($cxx.path)" +cxx = cc config.cxx="'$recall($cxx.path)'" status += -d prj deinit += -d prj diff --git a/tests/new.testscript b/tests/new.testscript index 73f4c6c..3692e54 100644 --- a/tests/new.testscript +++ b/tests/new.testscript @@ -14,8 +14,8 @@ c_tests = ($c.target.class != 'windows' && $c.target.class != 'macos') # test.arguments += --no-checks -c = config.c="$recall($c.path)" -cxx = config.cxx="$recall($cxx.path)" +c = config.c="'$recall($c.path)'" +cxx = config.cxx="'$recall($cxx.path)'" status += -d prj diff --git a/tests/publish.testscript b/tests/publish.testscript index c28a6a3..d10c3fe 100644 --- a/tests/publish.testscript +++ b/tests/publish.testscript @@ -30,7 +30,7 @@ end test.arguments += --repository "$repository" --yes \ --author-name user --author-email user@example.com -cxx = cc config.cxx="$recall($cxx.path)" +cxx = cc config.cxx="'$recall($cxx.path)'" new += 2>! init += $cxx -d prj 2>! &prj/**/bootstrap/*** diff --git a/tests/status.testscript b/tests/status.testscript index d8e1be9..27a6a60 100644 --- a/tests/status.testscript +++ b/tests/status.testscript @@ -4,7 +4,7 @@ .include common.testscript project.testscript -cxx = cc config.cxx="$recall($cxx.path)" +cxx = cc config.cxx="'$recall($cxx.path)'" new += 2>! init += $cxx -d prj 2>! diff --git a/tests/sync.testscript b/tests/sync.testscript index faef7d6..c0caab1 100644 --- a/tests/sync.testscript +++ b/tests/sync.testscript @@ -4,7 +4,7 @@ .include common.testscript -cxx = cc config.cxx="$recall($cxx.path)" +cxx = cc config.cxx="'$recall($cxx.path)'" new += 2>! init += $cxx -d prj 2>! diff --git a/tests/test.testscript b/tests/test.testscript index c39ddb5..9d0191e 100644 --- a/tests/test.testscript +++ b/tests/test.testscript @@ -4,10 +4,10 @@ .include common.testscript -cxx = cc config.cxx="$recall($cxx.path)" +cxx = cc config.cxx="'$recall($cxx.path)'" new += 2>! -init += cc "config.cxx=$config.cxx" -d prj 2>! +init += cc "'config.cxx=$config.cxx'" -d prj 2>! deinit += -d prj : single-pkg-cfg diff --git a/tests/update.testscript b/tests/update.testscript index d97fcf3..2701b3b 100644 --- a/tests/update.testscript +++ b/tests/update.testscript @@ -7,7 +7,7 @@ .include common.testscript -cxx = cc config.cxx="$recall($cxx.path)" +cxx = cc config.cxx="'$recall($cxx.path)'" new += 2>! init += $cxx -d prj 2>! |