From 08eea971d2d3170ca357935644483dc520f46173 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 1 Dec 2016 13:19:49 +0200 Subject: Organize tests/, factor common testscript fragments --- tests/function/builtin/buildfile | 2 -- tests/function/builtin/testscript | 8 +------- tests/function/path/buildfile | 2 -- tests/function/path/testscript | 8 +------- 4 files changed, 2 insertions(+), 18 deletions(-) (limited to 'tests/function') diff --git a/tests/function/builtin/buildfile b/tests/function/builtin/buildfile index 5a49ad0..fb06e73 100644 --- a/tests/function/builtin/buildfile +++ b/tests/function/builtin/buildfile @@ -3,5 +3,3 @@ # license : MIT; see accompanying LICENSE file ./: test{testscript} - -test{*}: test = $effect($build.path) diff --git a/tests/function/builtin/testscript b/tests/function/builtin/testscript index 6491a60..98513d3 100644 --- a/tests/function/builtin/testscript +++ b/tests/function/builtin/testscript @@ -2,13 +2,7 @@ # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -+mkdir build -+cat <>>build/bootstrap.build -project = test -amalgamation = -EOI - -test.options += -q --buildfile - noop +.include ../../common.test : type : diff --git a/tests/function/path/buildfile b/tests/function/path/buildfile index 8f51cab..65ed19b 100644 --- a/tests/function/path/buildfile +++ b/tests/function/path/buildfile @@ -3,5 +3,3 @@ # license : MIT; see accompanying LICENSE file ./: test{testscript} - -test{*}: test = $effect($build.path) diff --git a/tests/function/path/testscript b/tests/function/path/testscript index fc1cb31..8b527e3 100644 --- a/tests/function/path/testscript +++ b/tests/function/path/testscript @@ -2,13 +2,7 @@ # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -+mkdir build -+cat <>>build/bootstrap.build -project = test -amalgamation = -EOI - -test.options += -q --buildfile - noop +.include ../../common.test +if ($cxx.target.class != windows) # @@ TMP ternarry s = '/' -- cgit v1.1