From 08eea971d2d3170ca357935644483dc520f46173 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 1 Dec 2016 13:19:49 +0200
Subject: Organize tests/, factor common testscript fragments

---
 tests/expansion/buildfile   |  4 +---
 tests/expansion/common.test | 11 -----------
 tests/expansion/type.test   |  2 +-
 3 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 tests/expansion/common.test

(limited to 'tests/expansion')

diff --git a/tests/expansion/buildfile b/tests/expansion/buildfile
index 81df59e..2f02852 100644
--- a/tests/expansion/buildfile
+++ b/tests/expansion/buildfile
@@ -2,6 +2,4 @@
 # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{type} file{common.test}
-
-test{*}: test = $effect($build.path)
+./: test{type}
diff --git a/tests/expansion/common.test b/tests/expansion/common.test
deleted file mode 100644
index 881c74e..0000000
--- a/tests/expansion/common.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# file      : tests/expansion/assert.test
-# copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-+mkdir build
-+cat <<EOI >>>build/bootstrap.build
-project = test
-amalgamation =
-EOI
-
-test.options += -q --buildfile - noop
diff --git a/tests/expansion/type.test b/tests/expansion/type.test
index 27c646d..7ac6524 100644
--- a/tests/expansion/type.test
+++ b/tests/expansion/type.test
@@ -4,7 +4,7 @@
 
 # Test type propagation during expansion.
 
-.include common.test
+.include ../common.test
 
 : var
 :
-- 
cgit v1.1