2 files changed, 10 insertions, 23 deletions
diff --git a/tests/mventry/driver.cxx b/tests/mventry/driver.cxx
index cb1c348..e895ad6 100644
--- a/tests/mventry/driver.cxx
+++ b/tests/mventry/driver.cxx
@@ -1,28 +1,15 @@
 // file      : tests/mventry/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
-#ifndef __cpp_lib_modules_ts
 #include <iostream>
 #include <system_error>
-#endif
 
-// Other includes.
+#include <libbutl/path.hxx>
+#include <libbutl/utility.hxx>    // operator<<(ostream, exception)
+#include <libbutl/filesystem.hxx>
 
-#ifdef __cpp_modules_ts
-#ifdef __cpp_lib_modules_ts
-import std.core;
-import std.io;
-#endif
-import butl.path;
-import butl.utility;    // operator<<(ostream, exception)
-import butl.filesystem;
-#else
-#include <libbutl/path.mxx>
-#include <libbutl/utility.mxx>
-#include <libbutl/filesystem.mxx>
-#endif
+#undef NDEBUG
+#include <cassert>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/mventry/testscript b/tests/mventry/testscript
index 61ef871..f52be79 100644
--- a/tests/mventry/testscript
+++ b/tests/mventry/testscript
@@ -98,16 +98,16 @@
 if ($test.target == $build.host)
 {
   +if ($cxx.target.class != 'windows')
-    lnf = ^ln -s t l &l
-    lnd = $lnf
+    lnf = [cmdline] ^ln -s t l &l
+    lnd = [cmdline] $lnf
   else
     echo 'yes' >=t
     if cmd /C 'mklink l t' >- 2>- &?l && cat l >'yes'
-      lnf = cmd /C 'mklink l t' &l >-
-      lnd = cmd /C 'mklink /D l t' &l >-
+      lnf = [cmdline] cmd /C 'mklink l t' &l >-
+      lnd = [cmdline] cmd /C 'mklink /D l t' &l >-
     end
 
-    jnc = cmd /C 'mklink /J l t' &l >-
+    jnc = [cmdline] cmd /C 'mklink /J l t' &l >-
   end
 
   : symlink