From 616690fd06d1c5d05de97b88119dd8d328522df0 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 26 Oct 2016 13:38:27 +0200
Subject: Implement support for testscript scopes

---
 tests/test/script/integration/testscript | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'tests')

diff --git a/tests/test/script/integration/testscript b/tests/test/script/integration/testscript
index e98a25c..a9c29a7 100644
--- a/tests/test/script/integration/testscript
+++ b/tests/test/script/integration/testscript
@@ -14,28 +14,32 @@ test.arguments = test
 #EOI
 +cp $src_base/bootstrap.build build/
 
-# @@ TODO: redo as scope.
-#
-touch testscript foo.test bar.test;
-$* <<EOI 2>>EOE != 0;
-./: test{testscript foo}
+{
+  +touch testscript foo.test bar.test
+
+  $* <<EOI 2>>EOE != 0
+./: 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 2>>EOE != 0
+./: test{../foo ../testscript}
 EOI
 error: both 'testscript' and other names specified for dir{./}
 info: while testing dir{./}
 EOE
-$* <<EOI 2>>EOE;
-./: test{foo bar}
+
+  $* <<EOI 2>>EOE
+./: test{../foo ../bar}
 EOI
-test dir{./} with test{foo}
-test dir{./} with test{bar}
+test dir{./} with ../test{foo}
+test dir{./} with ../test{bar}
 EOE
-rm -f testscript foo.test bar.test
+
+  -rm -f testscript foo.test bar.test
+}
 
 # work-dir-not-empty-begin
 #
-- 
cgit v1.1