summaryrefslogtreecommitdiff
path: root/cli-tests
diff options
context:
space:
mode:
Diffstat (limited to 'cli-tests')
-rw-r--r--cli-tests/build/root.build3
-rw-r--r--cli-tests/combined/testscript12
-rw-r--r--cli-tests/file/testscript4
-rw-r--r--cli-tests/group/driver.cxx2
-rw-r--r--cli-tests/manifest6
5 files changed, 14 insertions, 13 deletions
diff --git a/cli-tests/build/root.build b/cli-tests/build/root.build
index 5f4b348..90a319a 100644
--- a/cli-tests/build/root.build
+++ b/cli-tests/build/root.build
@@ -16,7 +16,8 @@ if ($cxx.target.system == 'win32-msvc')
if ($cxx.class == 'msvc')
cxx.coptions += /wd4251 /wd4275 /wd4800
-using cli
+if ($build.mode != 'skeleton')
+ using cli
# Every exe{} in this project is by default a test.
#
diff --git a/cli-tests/combined/testscript b/cli-tests/combined/testscript
index d1f9830..f6261ab 100644
--- a/cli-tests/combined/testscript
+++ b/cli-tests/combined/testscript
@@ -3,7 +3,7 @@
: values
:
-{
+{{
: long
:
$* --foo=123 >'--foo=123'
@@ -36,7 +36,7 @@
: options-file
:
- {
+ {{
: basics
:
cat <<EOI >=options;
@@ -64,12 +64,12 @@
--foo="'bar 123'"
EOI
$* --file=options >"--foo='bar 123'"
- }
-}
+ }}
+}}
: flags
:
-{
+{{
: basic
:
$* -zyx >'-xyz'
@@ -105,4 +105,4 @@
$* -xyf=123 2>>EOE != 0
missing value for option '-f'
EOE
-}
+}}
diff --git a/cli-tests/file/testscript b/cli-tests/file/testscript
index 6f83f91..658227d 100644
--- a/cli-tests/file/testscript
+++ b/cli-tests/file/testscript
@@ -284,7 +284,7 @@ EOO
: relativeness
:
-{
+{{
+cat <<EOI >=test1.ops
-a 11
--file test/test.ops
@@ -335,4 +335,4 @@ EOO
-b
22
EOO
-}
+}}
diff --git a/cli-tests/group/driver.cxx b/cli-tests/group/driver.cxx
index 357b9a9..9a3c710 100644
--- a/cli-tests/group/driver.cxx
+++ b/cli-tests/group/driver.cxx
@@ -52,7 +52,7 @@ main (int argc, char* argv[])
s.peek ();
assert (pos == s.position ());
- const char* a;
+ const char* a (0);
if (!sa)
{
a = s.next ();
diff --git a/cli-tests/manifest b/cli-tests/manifest
index cd8475a..4f4e8f0 100644
--- a/cli-tests/manifest
+++ b/cli-tests/manifest
@@ -1,6 +1,6 @@
: 1
name: cli-tests
-version: 1.2.0-b.8.z
+version: 1.2.1-a.0.z
project: cli
summary: Tests for the CLI compiler for C++
license: MIT
@@ -10,5 +10,5 @@ doc-url: https://www.codesynthesis.com/projects/cli/doc/guide/
src-url: https://git.codesynthesis.com/cgit/cli/cli/tree/cli-tests/
email: cli-users@codesynthesis.com ; Mailing list
requires: c++14
-depends: * build2 >= 0.14.0-
-depends: * bpkg >= 0.14.0-
+depends: * build2 >= 0.18.0-
+depends: * bpkg >= 0.18.0-