aboutsummaryrefslogtreecommitdiff
path: root/tests/test/script
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-02-09 15:00:16 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-02-09 15:00:16 +0200
commitab0d6919707349436edd336bbfa8f433bd6e6749 (patch)
tree864fc885d71ab8205f9c47f0c813b0a48166de33 /tests/test/script
parentdab05fa5ebea3aaf7107c8acf18a7f17c556a45c (diff)
Fix broken test (and few other things)
Diffstat (limited to 'tests/test/script')
-rw-r--r--tests/test/script/generated/buildfile2
-rw-r--r--tests/test/script/generated/driver.cxx11
-rw-r--r--tests/test/script/generated/testscript7
-rw-r--r--tests/test/script/generated/testscript.in2
4 files changed, 3 insertions, 19 deletions
diff --git a/tests/test/script/generated/buildfile b/tests/test/script/generated/buildfile
index c27b49d..524be44 100644
--- a/tests/test/script/generated/buildfile
+++ b/tests/test/script/generated/buildfile
@@ -5,4 +5,4 @@
# Test generated testscripts.
#
-./: test{testscript} $b file{*.cxx +*.in}
+./: test{testscript} $b file{*.in}
diff --git a/tests/test/script/generated/driver.cxx b/tests/test/script/generated/driver.cxx
deleted file mode 100644
index e155462..0000000
--- a/tests/test/script/generated/driver.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-// file : tests/test/script/generated/driver.cxx -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
-
-#include <iostream>
-
-int
-main ()
-{
- std::cout << "1.2.3" << std::endl;
-}
diff --git a/tests/test/script/generated/testscript b/tests/test/script/generated/testscript
index 572c73f..8b9d2ab 100644
--- a/tests/test/script/generated/testscript
+++ b/tests/test/script/generated/testscript
@@ -19,16 +19,11 @@ name: test
version: 1.2.3
EOI
-+cat <<EOI >=build/root.build
-using cxx
-EOI
-
: testscript
:
-ln -s $src_base/driver.cxx ./;
ln -s $src_base/testscript.in ./;
$* <<EOI
-exe{driver}: cxx{driver} test{testscript}
+./: test{testscript}
test{testscript}: in{testscript} $src_root/file{manifest} #@@ in module
test{testscript}: in.symbol = '@'
EOI
diff --git a/tests/test/script/generated/testscript.in b/tests/test/script/generated/testscript.in
index b030b39..297d79d 100644
--- a/tests/test/script/generated/testscript.in
+++ b/tests/test/script/generated/testscript.in
@@ -2,4 +2,4 @@
# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
-$* >'@version@'
+echo '@version@' >'1.2.3'