From 4e16f8438cad62cd4217faa9806cb354b950ccc4 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 15 Jun 2017 14:56:11 +0200
Subject: Fix modules test not to run for VC15u0

---
 tests/cc/modules/testscript | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'tests/cc')

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
-- 
cgit v1.1