From ea84c30622ea265b38ec7235c707f8b75df78b16 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 28 Oct 2016 17:45:49 +0200
Subject: Update testscripts

---
 tests/test/script/integration/testscript | 10 ++--------
 tests/test/script/runner/cleanup.test    | 20 ++++++++++++++++++++
 tests/test/script/runner/status.test     |  2 +-
 unit-tests/test/script/lexer/buildfile   |  3 ++-
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/tests/test/script/integration/testscript b/tests/test/script/integration/testscript
index a9c29a7..27c1a5d 100644
--- a/tests/test/script/integration/testscript
+++ b/tests/test/script/integration/testscript
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-test.options += --buildfile -
+test.options += -q --buildfile -
 test.arguments = test
 
 +mkdir build
@@ -21,22 +21,17 @@ test.arguments = test
 ./: test{../testscript ../foo}
 EOI
 error: both 'testscript' and other names specified for dir{./}
-info: while testing dir{./}
 EOE
 
   $* <<EOI 2>>EOE != 0
 ./: test{../foo ../testscript}
 EOI
 error: both 'testscript' and other names specified for dir{./}
-info: while testing dir{./}
 EOE
 
-  $* <<EOI 2>>EOE
+  $* <<EOI
 ./: test{../foo ../bar}
 EOI
-test dir{./} with ../test{foo}
-test dir{./} with ../test{bar}
-EOE
 
   -rm -f testscript foo.test bar.test
 }
@@ -50,7 +45,6 @@ $* <<EOI 2>>EOE != 0;
 ./: test{foo}
 EOI
 error: working directory test/ is not empty at the beginning of the test
-info: while testing dir{./}
 EOE
 rm -f test/dummy foo.test;
 rmdir test
diff --git a/tests/test/script/runner/cleanup.test b/tests/test/script/runner/cleanup.test
index 76cff63..9a660d5 100644
--- a/tests/test/script/runner/cleanup.test
+++ b/tests/test/script/runner/cleanup.test
@@ -2,9 +2,29 @@
 # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
++mkdir build &build/ # @@ Should not be necessary once builtin.
++cat <<EOI >>>build/boostrap.build
+project = test
+amalgamation =
+
+using test
+EOI
+
+b = $build.driver -q --no-column --buildfile - <"./: test{testscript}" \
+  &test/ test
+c = cat >>>testscript
+
 $* -f a &a                                       # file
 $* -d a &a/                                      # dir1
 $* -d a/b &a/ &a/b/                              # dir2
 $* -d a/b -f a/b/c &a/ &a/b/ &a/b/c              # file-dir
 $* -f a &a &a                                    # file-dup
 $* -d a/b &a/ &a/b/ &a/b/../b/                   # dir-dup
+
+# <test-id>
+#
+# @@ TODO: $c <"$* &a/" && $b 2>>EOE
+$c <"$* &a/";
+$b 2>>EOE != 0
+testscript:1: error: registered for cleanup directory test/1/a/ does not exist
+EOE
diff --git a/tests/test/script/runner/status.test b/tests/test/script/runner/status.test
index 5d4d116..0ef1ee9 100644
--- a/tests/test/script/runner/status.test
+++ b/tests/test/script/runner/status.test
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-$*                                                   # status-def
+$*                                                   # status-def @@ status- is already in file name
 $*      == 0                                         # status-eq-0
 $* -s 1 != 0                                         # status-ne-0
 $* -s 1 == 1                                         # status-eq-1
diff --git a/unit-tests/test/script/lexer/buildfile b/unit-tests/test/script/lexer/buildfile
index d9b17e8..16be005 100644
--- a/unit-tests/test/script/lexer/buildfile
+++ b/unit-tests/test/script/lexer/buildfile
@@ -5,7 +5,8 @@
 #@@ Temporary until we get utility library support.
 #
 import libs = libbutl%lib{butl}
-src = token lexer diagnostics utility variable name test/script/{token lexer}
+src = token lexer diagnostics utility variable name b-options types-parsers \
+test/script/{token lexer}
 
 exe{driver}: cxx{driver} ../../../../build2/cxx{$src} $libs \
 test{script-line command-line first-token second-token variable-line \
-- 
cgit v1.1