aboutsummaryrefslogtreecommitdiff
path: root/tests/curl
diff options
context:
space:
mode:
Diffstat (limited to 'tests/curl')
-rw-r--r--tests/curl/buildfile6
-rw-r--r--tests/curl/driver.cxx31
2 files changed, 33 insertions, 4 deletions
diff --git a/tests/curl/buildfile b/tests/curl/buildfile
index 20617cf..dae375b 100644
--- a/tests/curl/buildfile
+++ b/tests/curl/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/curl/driver.cxx b/tests/curl/driver.cxx
index b5fc400..326d717 100644
--- a/tests/curl/driver.cxx
+++ b/tests/curl/driver.cxx
@@ -2,12 +2,35 @@
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
+#include <cassert>
+
+#ifndef __cpp_lib_modules
#include <iostream>
#include <system_error>
-
-#include <libbutl/path.hxx>
-#include <libbutl/utility.hxx> // operator<<(ostream, exception)
-#include <libbutl/curl.hxx>
+#endif
+
+// Other includes.
+
+#ifdef __cpp_modules
+#ifdef __cpp_lib_modules
+import std.core;
+import std.io;
+#endif
+import butl.curl;
+import butl.path;
+import butl.process;
+import butl.utility; // operator<<(ostream, exception)
+import butl.fdstream;
+
+import butl.optional; // @@ MOD Clang should not be necessary.
+import butl.small_vector; // @@ MOD Clang should not be necessary.
+#else
+#include <libbutl/curl.mxx>
+#include <libbutl/path.mxx>
+#include <libbutl/process.mxx>
+#include <libbutl/utility.mxx>
+#include <libbutl/fdstream.mxx>
+#endif
using namespace std;
using namespace butl;