diff options
Diffstat (limited to 'tests')
80 files changed, 118 insertions, 170 deletions
diff --git a/tests/b-info/buildfile b/tests/b-info/buildfile index fd83787..0a05594 100644 --- a/tests/b-info/buildfile +++ b/tests/b-info/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/b-info/driver.cxx b/tests/b-info/driver.cxx index b128179..e22a018 100644 --- a/tests/b-info/driver.cxx +++ b/tests/b-info/driver.cxx @@ -4,15 +4,15 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #include <iostream> #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/base64/buildfile b/tests/base64/buildfile index c85126a..02a4f1e 100644 --- a/tests/base64/buildfile +++ b/tests/base64/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/base64/driver.cxx b/tests/base64/driver.cxx index 7746637..601f914 100644 --- a/tests/base64/driver.cxx +++ b/tests/base64/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #include <vector> #include <sstream> @@ -12,8 +12,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/build/root.build b/tests/build/root.build index 7e30c57..126009d 100644 --- a/tests/build/root.build +++ b/tests/build/root.build @@ -2,22 +2,10 @@ # copyright : Copyright (c) 2014-2019 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -cxx.std = experimental -cxx.features.modules = ($force_modules == true) +cxx.std = latest using cxx -if ($force_modules == true && !$cxx.features.modules) - fail 'c++ compiler does not support modules' - -if ($force_std_modules == true) -{ - import stdmod_lib = libstd-modules%liba{std-modules} - cxx.poptions += -D__cpp_lib_modules -} -else - stdmod_lib = - hxx{*}: extension = hxx cxx{*}: extension = cxx diff --git a/tests/command/buildfile b/tests/command/buildfile index cb0f272..27e74e8 100644 --- a/tests/command/buildfile +++ b/tests/command/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/command/driver.cxx b/tests/command/driver.cxx index a1baf68..39d38aa 100644 --- a/tests/command/driver.cxx +++ b/tests/command/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <ios> #include <string> #include <vector> @@ -14,8 +14,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/cpfile/buildfile b/tests/cpfile/buildfile index 3b42372..d7ac6a7 100644 --- a/tests/cpfile/buildfile +++ b/tests/cpfile/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/cpfile/driver.cxx b/tests/cpfile/driver.cxx index 3f97db7..5576a4f 100644 --- a/tests/cpfile/driver.cxx +++ b/tests/cpfile/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <ios> #include <string> #include <system_error> @@ -12,8 +12,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/curl/buildfile b/tests/curl/buildfile index fe5c7e0..87f9bf0 100644 --- a/tests/curl/buildfile +++ b/tests/curl/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/curl/driver.cxx b/tests/curl/driver.cxx index f2769a8..d90f536 100644 --- a/tests/curl/driver.cxx +++ b/tests/curl/driver.cxx @@ -4,15 +4,15 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <iostream> #include <system_error> #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/dir-iterator/buildfile b/tests/dir-iterator/buildfile index 00ad823..2d44bbb 100644 --- a/tests/dir-iterator/buildfile +++ b/tests/dir-iterator/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/dir-iterator/driver.cxx b/tests/dir-iterator/driver.cxx index 7598a4f..4fd04b7 100644 --- a/tests/dir-iterator/driver.cxx +++ b/tests/dir-iterator/driver.cxx @@ -4,15 +4,15 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <cstddef> // size_t #include <iostream> #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/entry-time/buildfile b/tests/entry-time/buildfile index 3a21d56..97273ea 100644 --- a/tests/entry-time/buildfile +++ b/tests/entry-time/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/entry-time/driver.cxx b/tests/entry-time/driver.cxx index 9ce27ee..64538ea 100644 --- a/tests/entry-time/driver.cxx +++ b/tests/entry-time/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #include <chrono> #include <iostream> @@ -12,8 +12,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/fdstream/buildfile b/tests/fdstream/buildfile index f69bc95..cf3d3aa 100644 --- a/tests/fdstream/buildfile +++ b/tests/fdstream/buildfile @@ -3,7 +3,6 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/fdstream/driver.cxx b/tests/fdstream/driver.cxx index ee75a31..4a85526 100644 --- a/tests/fdstream/driver.cxx +++ b/tests/fdstream/driver.cxx @@ -8,7 +8,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #ifndef _WIN32 # include <chrono> #endif @@ -27,8 +27,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #ifndef _WIN32 diff --git a/tests/link/buildfile b/tests/link/buildfile index fb9956a..881625c 100644 --- a/tests/link/buildfile +++ b/tests/link/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/link/driver.cxx b/tests/link/driver.cxx index 6489d8d..362219e 100644 --- a/tests/link/driver.cxx +++ b/tests/link/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <set> #include <utility> // pair #include <iostream> // cerr @@ -13,8 +13,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/manifest-parser/buildfile b/tests/manifest-parser/buildfile index 1aa59e4..5be14d3 100644 --- a/tests/manifest-parser/buildfile +++ b/tests/manifest-parser/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/manifest-parser/driver.cxx b/tests/manifest-parser/driver.cxx index d11ba8f..65e6821 100644 --- a/tests/manifest-parser/driver.cxx +++ b/tests/manifest-parser/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <vector> #include <string> #include <utility> // pair, move() @@ -14,8 +14,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/manifest-rewriter/buildfile b/tests/manifest-rewriter/buildfile index c231631..3f04982 100644 --- a/tests/manifest-rewriter/buildfile +++ b/tests/manifest-rewriter/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/manifest-rewriter/driver.cxx b/tests/manifest-rewriter/driver.cxx index 11269ab..2033af0 100644 --- a/tests/manifest-rewriter/driver.cxx +++ b/tests/manifest-rewriter/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <vector> #include <string> #include <cstdint> // uint64_t @@ -15,8 +15,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/manifest-roundtrip/buildfile b/tests/manifest-roundtrip/buildfile index c251fb5..33a7814 100644 --- a/tests/manifest-roundtrip/buildfile +++ b/tests/manifest-roundtrip/buildfile @@ -3,7 +3,6 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs exe{driver}: manifest: test.roundtrip = true diff --git a/tests/manifest-roundtrip/driver.cxx b/tests/manifest-roundtrip/driver.cxx index e13688d..3936f77 100644 --- a/tests/manifest-roundtrip/driver.cxx +++ b/tests/manifest-roundtrip/driver.cxx @@ -4,15 +4,15 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #include <iostream> #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/manifest-serializer/buildfile b/tests/manifest-serializer/buildfile index 82b0f09..6ac57e5 100644 --- a/tests/manifest-serializer/buildfile +++ b/tests/manifest-serializer/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/manifest-serializer/driver.cxx b/tests/manifest-serializer/driver.cxx index 4cddb57..c471776 100644 --- a/tests/manifest-serializer/driver.cxx +++ b/tests/manifest-serializer/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <vector> #include <string> #include <utility> // pair @@ -14,8 +14,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/mventry/buildfile b/tests/mventry/buildfile index e3dc517..7ebb572 100644 --- a/tests/mventry/buildfile +++ b/tests/mventry/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/mventry/driver.cxx b/tests/mventry/driver.cxx index b705831..8422c81 100644 --- a/tests/mventry/driver.cxx +++ b/tests/mventry/driver.cxx @@ -4,15 +4,15 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <iostream> #include <system_error> #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/openssl/buildfile b/tests/openssl/buildfile index 7e6a4b8..e74b94b 100644 --- a/tests/openssl/buildfile +++ b/tests/openssl/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/openssl/driver.cxx b/tests/openssl/driver.cxx index c84f838..a1d0f4e 100644 --- a/tests/openssl/driver.cxx +++ b/tests/openssl/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <vector> #include <iostream> #include <iterator> @@ -13,8 +13,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/pager/buildfile b/tests/pager/buildfile index 4b601ab..51d9bee 100644 --- a/tests/pager/buildfile +++ b/tests/pager/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/pager/driver.cxx b/tests/pager/driver.cxx index 3eb9a81..e2681b4 100644 --- a/tests/pager/driver.cxx +++ b/tests/pager/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <ios> // ios_base::failure #include <vector> #include <string> @@ -15,8 +15,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/path-entry/buildfile b/tests/path-entry/buildfile index 9298fe4..7acbd7f 100644 --- a/tests/path-entry/buildfile +++ b/tests/path-entry/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/path-entry/driver.cxx b/tests/path-entry/driver.cxx index 252a6ca..797a5ef 100644 --- a/tests/path-entry/driver.cxx +++ b/tests/path-entry/driver.cxx @@ -4,15 +4,15 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <iostream> #include <system_error> #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/path/buildfile b/tests/path/buildfile index 0efbf6e..3e81b26 100644 --- a/tests/path/buildfile +++ b/tests/path/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/path/driver.cxx b/tests/path/driver.cxx index ededb58..72fdf9f 100644 --- a/tests/path/driver.cxx +++ b/tests/path/driver.cxx @@ -4,15 +4,15 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <iostream> #include <type_traits> #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/prefix-map/buildfile b/tests/prefix-map/buildfile index 5a038b6..5b94a17 100644 --- a/tests/prefix-map/buildfile +++ b/tests/prefix-map/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/prefix-map/driver.cxx b/tests/prefix-map/driver.cxx index dc820a3..23e9e60 100644 --- a/tests/prefix-map/driver.cxx +++ b/tests/prefix-map/driver.cxx @@ -4,15 +4,15 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #include <iostream> #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/process-run/buildfile b/tests/process-run/buildfile index 0c88f5a..a8f0f81 100644 --- a/tests/process-run/buildfile +++ b/tests/process-run/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/process-run/driver.cxx b/tests/process-run/driver.cxx index 8335e9b..e27d9e1 100644 --- a/tests/process-run/driver.cxx +++ b/tests/process-run/driver.cxx @@ -4,15 +4,15 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #include <iostream> #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/process/buildfile b/tests/process/buildfile index 8c932d8..43b4085 100644 --- a/tests/process/buildfile +++ b/tests/process/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/process/driver.cxx b/tests/process/driver.cxx index ea42c07..e3c8e4a 100644 --- a/tests/process/driver.cxx +++ b/tests/process/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <ios> #include <string> #include <vector> @@ -15,8 +15,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/progress/buildfile b/tests/progress/buildfile index ee983e0..e1a1e77 100644 --- a/tests/progress/buildfile +++ b/tests/progress/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/progress/driver.cxx b/tests/progress/driver.cxx index b306b3b..fd7996d 100644 --- a/tests/progress/driver.cxx +++ b/tests/progress/driver.cxx @@ -11,7 +11,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #include <cstddef> // size_t #include <iostream> @@ -22,8 +22,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #ifndef _WIN32 diff --git a/tests/project-name/buildfile b/tests/project-name/buildfile index 55e7e70..80c221c 100644 --- a/tests/project-name/buildfile +++ b/tests/project-name/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/project-name/driver.cxx b/tests/project-name/driver.cxx index 45cc72f..6c888a8 100644 --- a/tests/project-name/driver.cxx +++ b/tests/project-name/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <ios> // ios::*bit #include <string> #include <iostream> @@ -13,8 +13,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/regex/buildfile b/tests/regex/buildfile index 3ac2e44..91eb225 100644 --- a/tests/regex/buildfile +++ b/tests/regex/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/regex/driver.cxx b/tests/regex/driver.cxx index 7815a9b..4fee290 100644 --- a/tests/regex/driver.cxx +++ b/tests/regex/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #include <iostream> #include <exception> @@ -12,8 +12,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; import std.regex; // @@ MOD TODO: shouldn't be necessary (re-export). diff --git a/tests/semantic-version/buildfile b/tests/semantic-version/buildfile index cf0beca..250abd7 100644 --- a/tests/semantic-version/buildfile +++ b/tests/semantic-version/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/semantic-version/driver.cxx b/tests/semantic-version/driver.cxx index fa67d2b..9ffe671 100644 --- a/tests/semantic-version/driver.cxx +++ b/tests/semantic-version/driver.cxx @@ -4,14 +4,14 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <iostream> #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/sendmail/buildfile b/tests/sendmail/buildfile index a1cc9e4..7ca4436 100644 --- a/tests/sendmail/buildfile +++ b/tests/sendmail/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/sendmail/driver.cxx b/tests/sendmail/driver.cxx index 82e8bfb..c4e3445 100644 --- a/tests/sendmail/driver.cxx +++ b/tests/sendmail/driver.cxx @@ -4,15 +4,15 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <iostream> #include <system_error> #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/sha1/buildfile b/tests/sha1/buildfile index 670bed5..d19464a 100644 --- a/tests/sha1/buildfile +++ b/tests/sha1/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/sha1/driver.cxx b/tests/sha1/driver.cxx index 1233704..83d0fe9 100644 --- a/tests/sha1/driver.cxx +++ b/tests/sha1/driver.cxx @@ -4,15 +4,15 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #include <cstddef> // size_t #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; #endif import butl.sha1; diff --git a/tests/sha256/buildfile b/tests/sha256/buildfile index 670bed5..d19464a 100644 --- a/tests/sha256/buildfile +++ b/tests/sha256/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/sha256/driver.cxx b/tests/sha256/driver.cxx index 43c9905..77298b2 100644 --- a/tests/sha256/driver.cxx +++ b/tests/sha256/driver.cxx @@ -4,15 +4,15 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #include <cstddef> // size_t #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; #endif import butl.path; diff --git a/tests/small-forward-list/buildfile b/tests/small-forward-list/buildfile index 6730dde..f43ab7a 100644 --- a/tests/small-forward-list/buildfile +++ b/tests/small-forward-list/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/small-forward-list/driver.cxx b/tests/small-forward-list/driver.cxx index ea4489b..a16fcac 100644 --- a/tests/small-forward-list/driver.cxx +++ b/tests/small-forward-list/driver.cxx @@ -4,15 +4,15 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #include <iostream> #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/small-list/buildfile b/tests/small-list/buildfile index 708f902..0e8dde6 100644 --- a/tests/small-list/buildfile +++ b/tests/small-list/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/small-list/driver.cxx b/tests/small-list/driver.cxx index 59983aa..3f40991 100644 --- a/tests/small-list/driver.cxx +++ b/tests/small-list/driver.cxx @@ -4,15 +4,15 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #include <iostream> #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/small-vector/buildfile b/tests/small-vector/buildfile index 1145a6d..3be8d20 100644 --- a/tests/small-vector/buildfile +++ b/tests/small-vector/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/small-vector/driver.cxx b/tests/small-vector/driver.cxx index 38948f8..4b11437 100644 --- a/tests/small-vector/driver.cxx +++ b/tests/small-vector/driver.cxx @@ -4,15 +4,15 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #include <iostream> #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/standard-version/buildfile b/tests/standard-version/buildfile index 9935456..0305c9c 100644 --- a/tests/standard-version/buildfile +++ b/tests/standard-version/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/standard-version/driver.cxx b/tests/standard-version/driver.cxx index 72dbb4a..54fcfb8 100644 --- a/tests/standard-version/driver.cxx +++ b/tests/standard-version/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <ios> // ios::failbit, ios::badbit #include <string> #include <cstdint> // uint*_t @@ -14,8 +14,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/strcase/buildfile b/tests/strcase/buildfile index 1b41f73..1aab4ab 100644 --- a/tests/strcase/buildfile +++ b/tests/strcase/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/strcase/driver.cxx b/tests/strcase/driver.cxx index 2ba095a..e9b779c 100644 --- a/tests/strcase/driver.cxx +++ b/tests/strcase/driver.cxx @@ -4,14 +4,14 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; #endif import butl.utility; diff --git a/tests/string-parser/buildfile b/tests/string-parser/buildfile index cbea595..98e94da 100644 --- a/tests/string-parser/buildfile +++ b/tests/string-parser/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/string-parser/driver.cxx b/tests/string-parser/driver.cxx index b908b6b..4ffeb6a 100644 --- a/tests/string-parser/driver.cxx +++ b/tests/string-parser/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #include <vector> #include <iostream> @@ -12,8 +12,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/tab-parser/buildfile b/tests/tab-parser/buildfile index c527af6..fd666d0 100644 --- a/tests/tab-parser/buildfile +++ b/tests/tab-parser/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/tab-parser/driver.cxx b/tests/tab-parser/driver.cxx index 59622b6..3a5ffa3 100644 --- a/tests/tab-parser/driver.cxx +++ b/tests/tab-parser/driver.cxx @@ -4,15 +4,15 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #include <iostream> #endif // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/target-triplet/buildfile b/tests/target-triplet/buildfile index ea258d4..6a77de4 100644 --- a/tests/target-triplet/buildfile +++ b/tests/target-triplet/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/target-triplet/driver.cxx b/tests/target-triplet/driver.cxx index b6da550..3d0522c 100644 --- a/tests/target-triplet/driver.cxx +++ b/tests/target-triplet/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #include <iostream> #include <stdexcept> // invalid_argument @@ -12,8 +12,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/timestamp/buildfile b/tests/timestamp/buildfile index 0a0857e..6da0f57 100644 --- a/tests/timestamp/buildfile +++ b/tests/timestamp/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/timestamp/driver.cxx b/tests/timestamp/driver.cxx index 198c745..fbed9ec 100644 --- a/tests/timestamp/driver.cxx +++ b/tests/timestamp/driver.cxx @@ -6,7 +6,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <chrono> #include <locale> #include <clocale> @@ -17,8 +17,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/url/buildfile b/tests/url/buildfile index e3a666e..7a1a98a 100644 --- a/tests/url/buildfile +++ b/tests/url/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/url/driver.cxx b/tests/url/driver.cxx index cb2c738..8160d7d 100644 --- a/tests/url/driver.cxx +++ b/tests/url/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <string> #include <utility> // move() #include <iostream> @@ -14,8 +14,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif diff --git a/tests/uuid/buildfile b/tests/uuid/buildfile index 99d37e8..6c17ded 100644 --- a/tests/uuid/buildfile +++ b/tests/uuid/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/wildcard/buildfile b/tests/wildcard/buildfile index 81ca057..a25566a 100644 --- a/tests/wildcard/buildfile +++ b/tests/wildcard/buildfile @@ -3,6 +3,5 @@ # license : MIT; see accompanying LICENSE file import libs = libbutl%lib{butl} -libs += $stdmod_lib exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/tests/wildcard/driver.cxx b/tests/wildcard/driver.cxx index d8f63d4..7bc1661 100644 --- a/tests/wildcard/driver.cxx +++ b/tests/wildcard/driver.cxx @@ -4,7 +4,7 @@ #include <cassert> -#ifndef __cpp_lib_modules +#ifndef __cpp_lib_modules_ts #include <map> #include <string> #include <vector> @@ -15,8 +15,8 @@ // Other includes. -#ifdef __cpp_modules -#ifdef __cpp_lib_modules +#ifdef __cpp_modules_ts +#ifdef __cpp_lib_modules_ts import std.core; import std.io; #endif |