aboutsummaryrefslogtreecommitdiff
path: root/tests/dir-iterator
diff options
context:
space:
mode:
Diffstat (limited to 'tests/dir-iterator')
-rw-r--r--tests/dir-iterator/buildfile6
-rw-r--r--tests/dir-iterator/driver.cxx26
2 files changed, 27 insertions, 5 deletions
diff --git a/tests/dir-iterator/buildfile b/tests/dir-iterator/buildfile
index e536536..7f83e4f 100644
--- a/tests/dir-iterator/buildfile
+++ b/tests/dir-iterator/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/dir-iterator/driver.cxx b/tests/dir-iterator/driver.cxx
index f584c68..1adef6f 100644
--- a/tests/dir-iterator/driver.cxx
+++ b/tests/dir-iterator/driver.cxx
@@ -2,14 +2,30 @@
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <cstddef> // size_t
#include <cassert>
+
+#ifndef __cpp_lib_modules
+#include <cstddef> // size_t
#include <iostream>
+#endif
+
+// Other includes.
-#include <libbutl/path.hxx>
-#include <libbutl/path-io.hxx>
-#include <libbutl/utility.hxx> // operator<<(ostream, exception)
-#include <libbutl/filesystem.hxx>
+#ifdef __cpp_modules
+#ifdef __cpp_lib_modules
+import std.core;
+import std.io;
+#endif
+import butl.path;
+import butl.path_io;
+import butl.utility;
+import butl.filesystem;
+#else
+#include <libbutl/path.mxx>
+#include <libbutl/path-io.mxx>
+#include <libbutl/utility.mxx> // operator<<(ostream, exception)
+#include <libbutl/filesystem.mxx>
+#endif
using namespace std;
using namespace butl;