aboutsummaryrefslogtreecommitdiff
path: root/tests/cc/modules
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-06-15 14:56:11 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-06-15 14:56:11 +0200
commit4e16f8438cad62cd4217faa9806cb354b950ccc4 (patch)
treed6f46991e8890e009549ab832d18021b54189bea /tests/cc/modules
parenta69751532ad81841fcc0c18d2e9540cb230b26b1 (diff)
Fix modules test not to run for VC15u0
Diffstat (limited to 'tests/cc/modules')
-rw-r--r--tests/cc/modules/testscript11
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/cc/modules/testscript b/tests/cc/modules/testscript
index b17c1cb..5642be8 100644
--- a/tests/cc/modules/testscript
+++ b/tests/cc/modules/testscript
@@ -14,13 +14,18 @@ EOI
+cat <<EOI >=build/root.build
cxx.std = experimental
-# Force modules except for VC where we need at least 15u3.
+# Force modules.
#
-if ($cxx.id != 'msvc')
- cxx.features.modules = true
+cxx.features.modules = true
using cxx
+# We forced modules but for VC we need at least 15u3 (19.11). So "unforce"
+# them in this case.
+#
+if ($cxx.id == 'msvc' && $cxx.version.major == 19 && $cxx.version.minor < 11)
+ cxx.features.modules = false
+
hxx{*}: extension = hxx
mxx{*}: extension = mxx
cxx{*}: extension = cxx