diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2017-04-06 18:58:03 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2017-04-06 20:26:21 +0300 |
| commit | ef0e6c709051fc46968d64dcf1c86bd197fe45c2 (patch) | |
| tree | 5873b9ac6c638c1097bb988213a86593902c02eb /tests | |
| parent | a1ca1cff56f05c9d49ccb8edac2a4c6b191199fd (diff) | |
Invent notion of header for machine_manifest
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/buildtab/buildfile | 2 | ||||
| -rw-r--r-- | tests/manifest/buildfile | 2 | ||||
| -rw-r--r-- | tests/manifest/machine.test | 6 | ||||
| -rw-r--r-- | tests/variable/buildfile | 2 | ||||
| -rw-r--r-- | tests/variable/testscript | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/tests/buildtab/buildfile b/tests/buildtab/buildfile index f156dbf..466c8ad 100644 --- a/tests/buildtab/buildfile +++ b/tests/buildtab/buildfile @@ -2,7 +2,7 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -import libs += libbutl%lib{butl} +import libs = libbutl%lib{butl} exe{driver}: cxx{driver} ../../bbot/lib{bbot} $libs test{testscript} diff --git a/tests/manifest/buildfile b/tests/manifest/buildfile index 002dbb0..b9af8ef 100644 --- a/tests/manifest/buildfile +++ b/tests/manifest/buildfile @@ -2,7 +2,7 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -import libs += libbutl%lib{butl} +import libs = libbutl%lib{butl} exe{driver}: cxx{driver} ../../bbot/lib{bbot} $libs test{*} diff --git a/tests/manifest/machine.test b/tests/manifest/machine.test index cd50bd4..96619f9 100644 --- a/tests/manifest/machine.test +++ b/tests/manifest/machine.test @@ -15,8 +15,8 @@ test.options += -m : 1 id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 name: windows_10-msvc_14 - type: kvm summary: Windows 10 build 1607 with VC 14 update 3 + type: kvm EOF : nspawn @@ -25,8 +25,8 @@ test.options += -m : 1 id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 name: windows_10-msvc_14 - type: nspawn summary: Windows 10 build 1607 with VC 14 update 3 + type: nspawn EOF } @@ -36,8 +36,8 @@ $* <<EOI 2>'stdin:6:1: error: single machine manifest expected' == 1 : 1 id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 name: windows_10-msvc_14 -type: kvm summary: Windows 10 build 1607 with VC 14 update 3 +type: kvm : EOI diff --git a/tests/variable/buildfile b/tests/variable/buildfile index 7fb5105..e9c0cf2 100644 --- a/tests/variable/buildfile +++ b/tests/variable/buildfile @@ -2,7 +2,7 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -import libs += libbutl%lib{butl} +import libs = libbutl%lib{butl} exe{driver}: cxx{driver} ../../bbot/lib{bbot} $libs test{testscript} diff --git a/tests/variable/testscript b/tests/variable/testscript index d3d9302..3269a37 100644 --- a/tests/variable/testscript +++ b/tests/variable/testscript @@ -7,7 +7,7 @@ test.options += -u : valid : { - $* <<EOI >> EOO + $* <<EOI >>EOO config.cc.coptions="-O3 -stdlib='libc++'" ab'c="x y"' var=xy |