diff options
| -rw-r--r-- | bdep/new.cxx | 9 | ||||
| -rw-r--r-- | tests/build/root.build | 2 | ||||
| -rw-r--r-- | tests/buildfile | 4 | ||||
| -rw-r--r-- | tests/ci.testscript (renamed from tests/ci.test) | 4 | ||||
| -rw-r--r-- | tests/common.testscript (renamed from tests/common.test) | 6 | ||||
| -rw-r--r-- | tests/config.testscript (renamed from tests/config.test) | 4 | ||||
| -rw-r--r-- | tests/fetch.testscript (renamed from tests/fetch.test) | 4 | ||||
| -rw-r--r-- | tests/init.testscript (renamed from tests/init.test) | 4 | ||||
| -rw-r--r-- | tests/new.testscript (renamed from tests/new.test) | 4 | ||||
| -rw-r--r-- | tests/project.testscript (renamed from tests/project.test) | 2 | ||||
| -rw-r--r-- | tests/publish.testscript (renamed from tests/publish.test) | 4 | ||||
| -rw-r--r-- | tests/status.testscript (renamed from tests/status.test) | 4 | ||||
| -rw-r--r-- | tests/sync.testscript (renamed from tests/sync.test) | 4 | ||||
| -rw-r--r-- | tests/test.testscript (renamed from tests/test.test) | 4 | ||||
| -rw-r--r-- | tests/update.testscript (renamed from tests/update.test) | 4 |
15 files changed, 33 insertions, 30 deletions
diff --git a/bdep/new.cxx b/bdep/new.cxx index bb1f033..864050c 100644 --- a/bdep/new.cxx +++ b/bdep/new.cxx @@ -580,7 +580,8 @@ namespace bdep << " n = $name($t)..." << endl << endl << " ./: $d/exe{$n}" << endl - << " $d/exe{$n}: $t $d/{" << hs << "}{+$n} $d/test{+$n}" << endl + << " $d/exe{$n}: $t $d/{" << hs << + "}{+$n} $d/testscript{+$n}" << endl << " $d/exe{$n}: libue{" << s << "}: bin.whole = false"<< endl << "}" << endl; @@ -892,7 +893,8 @@ namespace bdep << " n = $name($t)..." << endl << endl << " ./: $d/exe{$n}" << endl - << " $d/exe{$n}: $t $d/{" << hs << "}{+$n} $d/test{+$n}" << endl + << " $d/exe{$n}: $t $d/{" << hs << + "}{+$n} $d/testscript{+$n}" << endl << " $d/exe{$n}: libul{" << s << "}: bin.whole = false"<< endl << "}" << endl; @@ -1199,7 +1201,8 @@ namespace bdep os.open (f = td / "buildfile"); os << "import libs = " << n << "%lib{" << s << "}" << endl << endl - << "exe{driver}: {" << hs << ' ' << x << "}{**} $libs test{**}" << endl; + << "exe{driver}: {" << hs << ' ' << x << + "}{**} $libs testscript{**}" << endl; // << endl // << x << ".poptions =+ \"-I$out_root\" \"-I$src_root\"" << endl; os.close (); diff --git a/tests/build/root.build b/tests/build/root.build index 9013029..8176e9e 100644 --- a/tests/build/root.build +++ b/tests/build/root.build @@ -10,7 +10,7 @@ using cxx # Setup the bdep that we are testing. # import bdep = bdep%exe{bdep} -test{*}: test = $bdep +testscript{*}: test = $bdep # Specify the test target for cross-testing. # diff --git a/tests/buildfile b/tests/buildfile index 6ab9123..0640b2f 100644 --- a/tests/buildfile +++ b/tests/buildfile @@ -3,8 +3,8 @@ # license : MIT; see accompanying LICENSE file define common: file -common{*}: extension = test +common{*}: extension = testscript commons = common project -./: test{* -{$commons}} common{$commons} $bdep +./: testscript{* -{$commons}} common{$commons} $bdep diff --git a/tests/ci.test b/tests/ci.testscript index f398c5e..07d1923 100644 --- a/tests/ci.test +++ b/tests/ci.testscript @@ -1,8 +1,8 @@ -# file : tests/ci.test +# file : tests/ci.testscript # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -.include common.test project.test +.include common.testscript project.testscript # bdep-ci requirements for the minimum supported git version are higher then # the default 2.1.0 (see bdep/ci.cxx for details). diff --git a/tests/common.test b/tests/common.testscript index 46c4de9..400ae48 100644 --- a/tests/common.test +++ b/tests/common.testscript @@ -1,4 +1,4 @@ -# file : tests/common.test +# file : tests/common.testscript # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file @@ -54,8 +54,8 @@ update = $* update config = $* config publish = $* publish -# All testscripts are named after bdep commands, for example sync.test. So the -# testscript scope id is a name of the command being tested. +# All testscripts are named after bdep commands, for example sync.testscript. +# So the testscript scope id is a name of the command being tested. # cmd = [string] $@ test.arguments = $cmd diff --git a/tests/config.test b/tests/config.testscript index 0500686..68e504c 100644 --- a/tests/config.test +++ b/tests/config.testscript @@ -1,11 +1,11 @@ -# file : tests/config.test +# file : tests/config.testscript # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file # Note that we test the list sub-command while testing other sub-commands. # -.include common.test project.test +.include common.testscript project.testscript cxx = cc config.cxx="$recall($cxx.path)" diff --git a/tests/fetch.test b/tests/fetch.testscript index d97bf63..2564470 100644 --- a/tests/fetch.test +++ b/tests/fetch.testscript @@ -1,8 +1,8 @@ -# file : tests/fetch.test +# file : tests/fetch.testscript # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -.include common.test project.test +.include common.testscript project.testscript cxx = cc config.cxx="$recall($cxx.path)" diff --git a/tests/init.test b/tests/init.testscript index 6214985..17af7e2 100644 --- a/tests/init.test +++ b/tests/init.testscript @@ -1,11 +1,11 @@ -# file : tests/init.test +# file : tests/init.testscript # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file # Here we test both init and deinit commands. # -.include common.test project.test +.include common.testscript project.testscript cxx = cc config.cxx="$recall($cxx.path)" diff --git a/tests/new.test b/tests/new.testscript index ec45788..abda94b 100644 --- a/tests/new.test +++ b/tests/new.testscript @@ -1,8 +1,8 @@ -# file : tests/new.test +# file : tests/new.testscript # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -.include common.test +.include common.testscript # Disable nesting checks in the created projects. # diff --git a/tests/project.test b/tests/project.testscript index 6ab2b4b..69288aa 100644 --- a/tests/project.test +++ b/tests/project.testscript @@ -1,4 +1,4 @@ -# file : tests/project.test +# file : tests/project.testscript # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file diff --git a/tests/publish.test b/tests/publish.testscript index 880c538..500d20e 100644 --- a/tests/publish.test +++ b/tests/publish.testscript @@ -1,8 +1,8 @@ -# file : tests/publish.test +# file : tests/publish.testscript # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -.include common.test project.test +.include common.testscript project.testscript # bdep-publish requirements for the minimum supported git version are higher # then the default 2.1.0 (see bdep/publish.cxx for details). diff --git a/tests/status.test b/tests/status.testscript index 2d60af5..905281e 100644 --- a/tests/status.test +++ b/tests/status.testscript @@ -1,8 +1,8 @@ -# file : tests/status.test +# file : tests/status.testscript # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -.include common.test project.test +.include common.testscript project.testscript cxx = cc config.cxx="$recall($cxx.path)" diff --git a/tests/sync.test b/tests/sync.testscript index 4872f11..d01550b 100644 --- a/tests/sync.test +++ b/tests/sync.testscript @@ -1,8 +1,8 @@ -# file : tests/sync.test +# file : tests/sync.testscript # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -.include common.test +.include common.testscript cxx = cc config.cxx="$recall($cxx.path)" diff --git a/tests/test.test b/tests/test.testscript index 667ee7a..dec9177 100644 --- a/tests/test.test +++ b/tests/test.testscript @@ -1,8 +1,8 @@ -# file : tests/test.test +# file : tests/test.testscript # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -.include common.test +.include common.testscript cxx = cc config.cxx="$recall($cxx.path)" diff --git a/tests/update.test b/tests/update.testscript index 12be96e..947abab 100644 --- a/tests/update.test +++ b/tests/update.testscript @@ -1,11 +1,11 @@ -# file : tests/update.test +# file : tests/update.testscript # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file # Here we test both update and clean commands. # -.include common.test +.include common.testscript cxx = cc config.cxx="$recall($cxx.path)" |