diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-01-12 12:17:32 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-01-12 12:17:32 +0200 |
| commit | b216616363cdb99b56dfef4fda3ce313bd617e1a (patch) | |
| tree | 3f8226022044c9e39adcb382260d9a84ad481e17 | |
| parent | 9bf93c1ab73ee3cd2b763285fc5fc5456e972854 (diff) | |
Rename script/integration to script-integration
| -rw-r--r-- | tests/test/buildfile | 2 | ||||
| -rw-r--r-- | tests/test/script-integration/buildfile (renamed from tests/test/script/integration/buildfile) | 5 | ||||
| -rw-r--r-- | tests/test/script-integration/testscript (renamed from tests/test/script/integration/testscript) | 4 | ||||
| -rw-r--r-- | tests/test/script/buildfile | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/tests/test/buildfile b/tests/test/buildfile index c0ea682..85ae8be 100644 --- a/tests/test/buildfile +++ b/tests/test/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -d = config-test/ script/ +d = config-test/ script/ script-integration/ ./: $d file{common.test} include $d diff --git a/tests/test/script/integration/buildfile b/tests/test/script-integration/buildfile index dcaa527..4249e1f 100644 --- a/tests/test/script/integration/buildfile +++ b/tests/test/script-integration/buildfile @@ -1,5 +1,8 @@ -# file : tests/test/script/integration/buildfile +# 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 index c09eb6c..914ff30 100644 --- a/tests/test/script/integration/testscript +++ b/tests/test/script-integration/testscript @@ -1,8 +1,8 @@ -# file : tests/test/script/integration/testscript +# file : tests/test/script-integration/testscript # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -.include ../../common.test +.include ../common.test : script-files : diff --git a/tests/test/script/buildfile b/tests/test/script/buildfile index 5bf02fb..b57c983 100644 --- a/tests/test/script/buildfile +++ b/tests/test/script/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -d = builtin/ integration/ runner/ +d = builtin/ runner/ ./: $d file{common.test} include $d |