From 36ec90018e1a6337d23fc5286ed926c2134bde1f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 5 Feb 2018 14:39:47 +0200
Subject: Add tests for auto-generated test inputs/outputs

---
 old-tests/test/generated/build/bootstrap.build |  8 ---
 old-tests/test/generated/buildfile             | 10 ---
 old-tests/test/generated/driver.cxx            | 26 --------
 old-tests/test/generated/test.out              |  1 -
 old-tests/test/generated/utility.cxx           |  1 -
 old-tests/test/simple/build/bootstrap.build    |  4 --
 old-tests/test/simple/buildfile                | 12 ----
 old-tests/test/simple/driver.cxx               | 14 -----
 old-tests/test/simple/test.out                 |  1 -
 old-tests/test/simple/utility.cxx              |  1 -
 tests/test/script-integration/buildfile        |  8 ---
 tests/test/script-integration/testscript       | 84 -------------------------
 tests/test/script/generated/buildfile          |  8 +++
 tests/test/script/generated/driver.cxx         | 11 ++++
 tests/test/script/generated/testscript         | 34 ++++++++++
 tests/test/script/generated/testscript.in      |  5 ++
 tests/test/script/integration/buildfile        |  8 +++
 tests/test/script/integration/testscript       | 86 ++++++++++++++++++++++++++
 tests/test/simple/generated/buildfile          |  8 +++
 tests/test/simple/generated/driver.cxx         | 11 ++++
 tests/test/simple/generated/output.in          |  1 +
 tests/test/simple/generated/testscript         | 42 +++++++++++++
 tests/test/simple/generated/utility.cxx        | 28 +++++++++
 23 files changed, 242 insertions(+), 170 deletions(-)
 delete mode 100644 old-tests/test/generated/build/bootstrap.build
 delete mode 100644 old-tests/test/generated/buildfile
 delete mode 100644 old-tests/test/generated/driver.cxx
 delete mode 100644 old-tests/test/generated/test.out
 delete mode 100644 old-tests/test/generated/utility.cxx
 delete mode 100644 old-tests/test/simple/build/bootstrap.build
 delete mode 100644 old-tests/test/simple/buildfile
 delete mode 100644 old-tests/test/simple/driver.cxx
 delete mode 100644 old-tests/test/simple/test.out
 delete mode 100644 old-tests/test/simple/utility.cxx
 delete mode 100644 tests/test/script-integration/buildfile
 delete mode 100644 tests/test/script-integration/testscript
 create mode 100644 tests/test/script/generated/buildfile
 create mode 100644 tests/test/script/generated/driver.cxx
 create mode 100644 tests/test/script/generated/testscript
 create mode 100644 tests/test/script/generated/testscript.in
 create mode 100644 tests/test/script/integration/buildfile
 create mode 100644 tests/test/script/integration/testscript
 create mode 100644 tests/test/simple/generated/buildfile
 create mode 100644 tests/test/simple/generated/driver.cxx
 create mode 100644 tests/test/simple/generated/output.in
 create mode 100644 tests/test/simple/generated/testscript
 create mode 100644 tests/test/simple/generated/utility.cxx

diff --git a/old-tests/test/generated/build/bootstrap.build b/old-tests/test/generated/build/bootstrap.build
deleted file mode 100644
index 1b04c1d..0000000
--- a/old-tests/test/generated/build/bootstrap.build
+++ /dev/null
@@ -1,8 +0,0 @@
-project = generated
-amalgamation = # Disabled.
-
-dist.package = $project
-
-using config
-using test
-using dist
diff --git a/old-tests/test/generated/buildfile b/old-tests/test/generated/buildfile
deleted file mode 100644
index d3fbc20..0000000
--- a/old-tests/test/generated/buildfile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Test generated input.
-#
-using cxx
-
-exe{utility}: cxx{utility}
-exe{driver}: cxx{driver}
-exe{driver}: test.input = exe{utility}    # Update test.
-exe{driver}: test.output = file{test.out} # Dist test.
-
-./: exe{driver}
diff --git a/old-tests/test/generated/driver.cxx b/old-tests/test/generated/driver.cxx
deleted file mode 100644
index f674141..0000000
--- a/old-tests/test/generated/driver.cxx
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <iostream>
-#include <fstream>
-
-using namespace std;
-
-int
-main (int argc, char* argv[])
-{
-  if (argc != 2)
-  {
-    cerr << "usage: " << argv[0] << " <file>" << endl;
-    return 1;
-  }
-
-  ifstream ifs (argv[1], ifstream::in | ifstream::binary | ifstream::ate);
-
-  if (!ifs.is_open ())
-    cerr << "unable to open " << argv[1] << endl;
-
-  if (ifs.tellg () == 0)
-    cerr << argv[1] << " is empty" << endl;
-
-  cout << "output" << endl;
-
-  return 0;
-}
diff --git a/old-tests/test/generated/test.out b/old-tests/test/generated/test.out
deleted file mode 100644
index 53752db..0000000
--- a/old-tests/test/generated/test.out
+++ /dev/null
@@ -1 +0,0 @@
-output
diff --git a/old-tests/test/generated/utility.cxx b/old-tests/test/generated/utility.cxx
deleted file mode 100644
index ca2ac4a..0000000
--- a/old-tests/test/generated/utility.cxx
+++ /dev/null
@@ -1 +0,0 @@
-int main () {}
diff --git a/old-tests/test/simple/build/bootstrap.build b/old-tests/test/simple/build/bootstrap.build
deleted file mode 100644
index 0b7a347..0000000
--- a/old-tests/test/simple/build/bootstrap.build
+++ /dev/null
@@ -1,4 +0,0 @@
-project = test-simple
-amalgamation = # Disabled.
-using config
-using test
diff --git a/old-tests/test/simple/buildfile b/old-tests/test/simple/buildfile
deleted file mode 100644
index 569c12c..0000000
--- a/old-tests/test/simple/buildfile
+++ /dev/null
@@ -1,12 +0,0 @@
-using cxx
-
-lib{utility}: cxx{utility}
-exe{driver}: cxx{driver} #lib{utility}
-
-#exe{driver}: test.roundtrip = test.out
-
-exe{*}: test = true
-exe{*}: test.output = test.out
-
-./: lib{utility} exe{driver}
-#./: exe{driver}
diff --git a/old-tests/test/simple/driver.cxx b/old-tests/test/simple/driver.cxx
deleted file mode 100644
index 3753821..0000000
--- a/old-tests/test/simple/driver.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <iostream>
-#include <cassert>
-
-using namespace std;
-
-int
-main ()
-{
-  cerr << "test is running (stderr)" << endl;
-  //assert (false);
-  cout << "test is running (stdout)" << endl;
-  return 0;
-  //return 1;
-}
diff --git a/old-tests/test/simple/test.out b/old-tests/test/simple/test.out
deleted file mode 100644
index 5d63fab..0000000
--- a/old-tests/test/simple/test.out
+++ /dev/null
@@ -1 +0,0 @@
-test is running (stdout)
diff --git a/old-tests/test/simple/utility.cxx b/old-tests/test/simple/utility.cxx
deleted file mode 100644
index c4bb446..0000000
--- a/old-tests/test/simple/utility.cxx
+++ /dev/null
@@ -1 +0,0 @@
-void f (){}
diff --git a/tests/test/script-integration/buildfile b/tests/test/script-integration/buildfile
deleted file mode 100644
index 4249e1f..0000000
--- a/tests/test/script-integration/buildfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# file      : tests/test/script-integration/buildfile
-# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-# Test integration of testscript into build system.
-#
-
-./: test{testscript} $b
diff --git a/tests/test/script-integration/testscript b/tests/test/script-integration/testscript
deleted file mode 100644
index faade22..0000000
--- a/tests/test/script-integration/testscript
+++ /dev/null
@@ -1,84 +0,0 @@
-# file      : tests/test/script-integration/testscript
-# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-.include ../common.test
-
-: script-files
-:
-{
-  +touch testscript foo.test bar.test
-
-  : testscript-and-other
-  :
-  $* <<EOI 2>>/EOE != 0
-  ./: test{../testscript ../foo}
-  EOI
-  error: both 'testscript' and other names specified for dir{./}
-  EOE
-
-  : other-and-testscript
-  :
-  $* <<EOI 2>>/EOE != 0
-  ./: test{../foo ../testscript}
-  EOI
-  error: both 'testscript' and other names specified for dir{./}
-  EOE
-
-  : others
-  :
-  $* <<EOI
-  ./: test{../foo ../bar}
-  EOI
-}
-
-: wd-is-file
-:
-: Note that here we can not use portable path modifier as not all slashes are
-: path separators.
-:
-touch foo.test;
-touch test;
-$* <<EOI 2>>~%EOE% != 0
-./: test{foo}
-EOI
-%error: working directory test[/\\] is a file/symlink%
-EOE
-
-: wd-exists-before
-:
-touch foo.test;
-mkdir test &!test/;
-$* <<EOI 2>>/EOE
-./: test{foo}
-EOI
-warning: working directory test/ exists at the beginning of the test
-EOE
-
-: wd-not-empty-before
-:
-touch foo.test;
-mkdir test &!test/;
-touch test/dummy &!test/dummy;
-$* <<EOI 2>>/EOE
-./: test{foo}
-EOI
-warning: working directory test/ exists and is not empty at the beginning of the test
-EOE
-
-: wd-not-empty-after
-:
-: The idea here is to run a nested testscript that creates (but does not
-: clean up) a file in our working directory. Note that an implicit cleanup
-: cancelation is not required as the file is out of the test root directory
-: scope. Also note that we still have to remove everything after detecting the
-: failure.
-:
-cat <<EOI >=foo.test;
-touch ../../dummy
-EOI
-$* <<EOI 2>>/EOE &test/*** != 0
-./: test{foo}
-EOI
-error: working directory test/ is not empty at the end of the test
-EOE
diff --git a/tests/test/script/generated/buildfile b/tests/test/script/generated/buildfile
new file mode 100644
index 0000000..c27b49d
--- /dev/null
+++ b/tests/test/script/generated/buildfile
@@ -0,0 +1,8 @@
+# file      : tests/test/script/generated/buildfile
+# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+# Test generated testscripts.
+#
+
+./: test{testscript} $b file{*.cxx +*.in}
diff --git a/tests/test/script/generated/driver.cxx b/tests/test/script/generated/driver.cxx
new file mode 100644
index 0000000..e155462
--- /dev/null
+++ b/tests/test/script/generated/driver.cxx
@@ -0,0 +1,11 @@
+// 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
new file mode 100644
index 0000000..572c73f
--- /dev/null
+++ b/tests/test/script/generated/testscript
@@ -0,0 +1,34 @@
+# file      : tests/test/script/generated/testscript
+# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+test.arguments = test clean
+
+# Note: using common.test from test/, not script/.
+#
+.include ../../common.test
+
+# @@ in module
+#
++cat <<EOI >+build/bootstrap.build
+using version
+EOI
++cat <<EOI >=manifest
+: 1
+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}: 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
new file mode 100644
index 0000000..b030b39
--- /dev/null
+++ b/tests/test/script/generated/testscript.in
@@ -0,0 +1,5 @@
+# file      : tests/test/script/generated/testscript.in
+# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+$* >'@version@'
diff --git a/tests/test/script/integration/buildfile b/tests/test/script/integration/buildfile
new file mode 100644
index 0000000..1cc1e30
--- /dev/null
+++ b/tests/test/script/integration/buildfile
@@ -0,0 +1,8 @@
+# file      : tests/test/script/integration/buildfile
+# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+# Test integration of testscript into build system.
+#
+
+./: test{testscript} $b
diff --git a/tests/test/script/integration/testscript b/tests/test/script/integration/testscript
new file mode 100644
index 0000000..7074e36
--- /dev/null
+++ b/tests/test/script/integration/testscript
@@ -0,0 +1,86 @@
+# file      : tests/test/script/integration/testscript
+# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+# Note: using common.test from test/, not script/.
+#
+.include ../../common.test
+
+: script-files
+:
+{
+  +touch testscript foo.test bar.test
+
+  : testscript-and-other
+  :
+  $* <<EOI 2>>/EOE != 0
+  ./: test{../testscript ../foo}
+  EOI
+  error: both 'testscript' and other names specified for dir{./}
+  EOE
+
+  : other-and-testscript
+  :
+  $* <<EOI 2>>/EOE != 0
+  ./: test{../foo ../testscript}
+  EOI
+  error: both 'testscript' and other names specified for dir{./}
+  EOE
+
+  : others
+  :
+  $* <<EOI
+  ./: test{../foo ../bar}
+  EOI
+}
+
+: wd-is-file
+:
+: Note that here we can not use portable path modifier as not all slashes are
+: path separators.
+:
+touch foo.test;
+touch test;
+$* <<EOI 2>>~%EOE% != 0
+./: test{foo}
+EOI
+%error: working directory test[/\\] is a file/symlink%
+EOE
+
+: wd-exists-before
+:
+touch foo.test;
+mkdir test &!test/;
+$* <<EOI 2>>/EOE
+./: test{foo}
+EOI
+warning: working directory test/ exists at the beginning of the test
+EOE
+
+: wd-not-empty-before
+:
+touch foo.test;
+mkdir test &!test/;
+touch test/dummy &!test/dummy;
+$* <<EOI 2>>/EOE
+./: test{foo}
+EOI
+warning: working directory test/ exists and is not empty at the beginning of the test
+EOE
+
+: wd-not-empty-after
+:
+: The idea here is to run a nested testscript that creates (but does not
+: clean up) a file in our working directory. Note that an implicit cleanup
+: cancelation is not required as the file is out of the test root directory
+: scope. Also note that we still have to remove everything after detecting the
+: failure.
+:
+cat <<EOI >=foo.test;
+touch ../../dummy
+EOI
+$* <<EOI 2>>/EOE &test/*** != 0
+./: test{foo}
+EOI
+error: working directory test/ is not empty at the end of the test
+EOE
diff --git a/tests/test/simple/generated/buildfile b/tests/test/simple/generated/buildfile
new file mode 100644
index 0000000..af97abd
--- /dev/null
+++ b/tests/test/simple/generated/buildfile
@@ -0,0 +1,8 @@
+# file      : tests/test/simple/generated/buildfile
+# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+# Test generated test inputs/outputs.
+#
+
+./: test{testscript} $b file{*.cxx +*.in}
diff --git a/tests/test/simple/generated/driver.cxx b/tests/test/simple/generated/driver.cxx
new file mode 100644
index 0000000..fb3ab8f
--- /dev/null
+++ b/tests/test/simple/generated/driver.cxx
@@ -0,0 +1,11 @@
+// file      : tests/test/simple/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/simple/generated/output.in b/tests/test/simple/generated/output.in
new file mode 100644
index 0000000..36d79d4
--- /dev/null
+++ b/tests/test/simple/generated/output.in
@@ -0,0 +1 @@
+$version$
diff --git a/tests/test/simple/generated/testscript b/tests/test/simple/generated/testscript
new file mode 100644
index 0000000..9ec5220
--- /dev/null
+++ b/tests/test/simple/generated/testscript
@@ -0,0 +1,42 @@
+# file      : tests/test/simple/generated/testscript
+# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+test.arguments = test clean
+
+.include ../../common.test
+
+# @@ in module
+#
++cat <<EOI >+build/bootstrap.build
+using version
+EOI
++cat <<EOI >=manifest
+: 1
+name: test
+version: 1.2.3
+EOI
+
++cat <<EOI >=build/root.build
+using cxx
+EOI
+
+: input
+:
+ln -s $src_base/driver.cxx ./;
+ln -s $src_base/utility.cxx ./;
+$* <<EOI
+exe{utility}: cxx{utility}
+exe{utility}: exe{driver}: test.input = true
+exe{driver}: cxx{driver}
+EOI
+
+: output
+:
+ln -s $src_base/driver.cxx ./;
+ln -s $src_base/output.in ./;
+$* <<EOI
+exe{driver}: cxx{driver}
+exe{driver}: file{output}: test.stdout = true
+file{output}: in{output} $src_root/file{manifest} #@@ in module
+EOI
diff --git a/tests/test/simple/generated/utility.cxx b/tests/test/simple/generated/utility.cxx
new file mode 100644
index 0000000..e2113bd
--- /dev/null
+++ b/tests/test/simple/generated/utility.cxx
@@ -0,0 +1,28 @@
+// file      : tests/test/simple/generated/utility.cxx -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#include <iostream>
+#include <fstream>
+
+using namespace std;
+
+int
+main (int argc, char* argv[])
+{
+  if (argc != 2)
+  {
+    cerr << "usage: " << argv[0] << " <file>" << endl;
+    return 1;
+  }
+
+  ifstream ifs (argv[1], ifstream::in | ifstream::binary | ifstream::ate);
+
+  if (!ifs.is_open ())
+    cerr << "unable to open " << argv[1] << endl;
+
+  if (ifs.tellg () == 0)
+    cerr << argv[1] << " is empty" << endl;
+
+  return 0;
+}
-- 
cgit v1.1