2 files changed, 45 insertions, 11 deletions
diff --git a/tests/buildtab/driver.cxx b/tests/buildtab/driver.cxx
index 097b3d9..5242fe4 100644
--- a/tests/buildtab/driver.cxx
+++ b/tests/buildtab/driver.cxx
@@ -26,14 +26,28 @@ try
   cin.exceptions  (ios::failbit | ios::badbit);
   cout.exceptions (ios::failbit | ios::badbit);
 
-  for (const auto& c: parse_buildtab (cin, "cin"))
+  for (const build_config& c: parse_buildtab (cin, "cin"))
   {
     cout << c.machine_pattern << ' ' << c.name << ' ' << c.target;
 
-    for (const auto& v: c.vars)
+    string classes;
+    for (const string& cs: c.classes)
+    {
+      if (!classes.empty ())
+        classes += ' ';
+
+      classes += cs;
+    }
+
+    if (c.classes.size () > 1)
+      cout << " \"" << classes << '"';
+    else
+      cout << ' ' << classes;
+
+    for (const string& v: c.vars)
       cout << ' ' << v;
 
-    for (const auto& r: c.warning_regexes)
+    for (const string& r: c.warning_regexes)
       cout << " ~" << r;
 
     cout << '\n';
diff --git a/tests/buildtab/testscript b/tests/buildtab/testscript
index 6adc4bc..511d284 100644
--- a/tests/buildtab/testscript
+++ b/tests/buildtab/testscript
@@ -10,19 +10,31 @@
   : all-fileds-combinations
   :
   $* <<EOF >>EOF
-  windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0
-  windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0 config.cc.coptions=/Z7 config.cc.loptions=/DEBUG ~"warning C4\d{3}: "
+  windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 default
+  windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0 default config.cc.coptions=/Z7 config.cc.loptions=/DEBUG ~"warning C4\d{3}: "
   EOF
 
   : empty-lines
   :
   $* <<EOI >>EOO
 
-  windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0
+  windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0 default
    # abc
   EOI
-  windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0
+  windows*-vc_14* windows-vc_14-32-debug i686-microsoft-win32-msvc14.0 default
   EOO
+
+  : single-class
+  :
+  $* <<EOF >>EOF
+  windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 default
+  EOF
+
+  : multiple-classes
+  :
+  $* <<EOF >>EOF
+  windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 "all default"
+  EOF
 }
 
 : parse-errors
@@ -52,22 +64,30 @@
   cin:1:34: error: missing cpu
   EOE
 
+  : invalid-class
+  :
+  $* <<EOI 2>>EOE == 1
+  windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 a=b
+  EOI
+  cin:1:64: error: class name 'a=b' contains '='
+  EOE
+
   : invalid-var
   :
   {
     : unquoted
     :
     $* <<EOI 2>>EOE == 1
-    windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 config.cc.coptions="/Z7
+    windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 default config.cc.coptions="/Z7
     EOI
-    cin:1:87: error: unterminated quoted string
+    cin:1:95: error: unterminated quoted string
     EOE
   }
 
   : dup-config-name
   :
   $* <<EOI 2>'cin:2:17: error: duplicate configuration name' == 1
-  windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0
-  windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0
+  windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 default
+  windows*-vc_14* windows-vc_14-32 i686-microsoft-win32-msvc14.0 default
   EOI
 }