aboutsummaryrefslogtreecommitdiff
path: root/tests/regex
diff options
context:
space:
mode:
Diffstat (limited to 'tests/regex')
-rw-r--r--tests/regex/buildfile6
-rw-r--r--tests/regex/driver.cxx20
2 files changed, 23 insertions, 3 deletions
diff --git a/tests/regex/buildfile b/tests/regex/buildfile
index baf4bca..ae7e2c3 100644
--- a/tests/regex/buildfile
+++ b/tests/regex/buildfile
@@ -4,4 +4,10 @@
import libs = libbutl%lib{butl}
+if ($cxx.features.modules && ($force_std_modules == true || $cxx.id != 'msvc'))
+{
+ import libs += libstd-modules%liba{std-modules}
+ cxx.poptions += -D__cpp_lib_modules
+}
+
exe{driver}: {hxx cxx}{*} $libs test{testscript}
diff --git a/tests/regex/driver.cxx b/tests/regex/driver.cxx
index 054eb31..d48b716 100644
--- a/tests/regex/driver.cxx
+++ b/tests/regex/driver.cxx
@@ -2,13 +2,27 @@
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <string>
#include <cassert>
+
+#ifndef __cpp_lib_modules
+#include <string>
#include <iostream>
#include <exception>
+#endif
+
+// Other includes.
-#include <libbutl/regex.hxx>
-#include <libbutl/utility.hxx> // operator<<(ostream, exception)
+#ifdef __cpp_modules
+#ifdef __cpp_lib_modules
+import std.core;
+import std.io;
+#endif
+import butl.regex;
+import butl.utility; // operator<<(ostream, exception)
+#else
+#include <libbutl/regex.mxx>
+#include <libbutl/utility.mxx>
+#endif
using namespace std;
using namespace butl;