test: Name expected results by language standard

Name files "gccxml.<std>.<test>.(stdout|stderr|result|xml).txt" where
"<std>" is either the language standard or "any" if the result works for
any standard.

126 files changed, 7 insertions, 7 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0c6550d..4d6b0dc 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -32,14 +32,14 @@ macro(castxml_test_gccxml_common prefix ext std test)
     --castxml-gccxml --castxml-start start
     -std=${std}
     ${CMAKE_CURRENT_LIST_DIR}/input/${test}.${ext}
-    -o ${prefix}.${test}.xml
+    -o ${prefix}.${std}.${test}.xml
     )
   add_test(
-    NAME ${prefix}.${test}
+    NAME ${prefix}.${std}.${test}
     COMMAND ${CMAKE_COMMAND}
     "-Dcommand:STRING=${command}"
-    "-Dexpect=${prefix}.${test}"
-    "-Dxml=${prefix}.${test}.xml"
+    "-Dexpect=${prefix}.${std}.${test};${prefix}.any.${test}"
+    "-Dxml=${prefix}.${std}.${test}.xml"
     "-Dxmllint=${LIBXML2_XMLLINT_EXECUTABLE}"
     -P ${CMAKE_CURRENT_SOURCE_DIR}/run.cmake
     )
@@ -54,7 +54,7 @@ macro(castxml_test_gccxml_broken test)
 endmacro()
 
 macro(castxml_test_gccxml_c test)
-  castxml_test_gccxml_common(gccxml.c c c89 ${test})
+  castxml_test_gccxml_common(gccxml c c89 ${test})
 endmacro()
 
 set(input ${CMAKE_CURRENT_LIST_DIR}/input)
diff --git a/test/expect/gccxml.c.invalid-result.txt b/test/expect/cmd.cc-missing.result.txt
index d00491f..d00491f 100644
--- a/test/expect/gccxml.c.invalid-result.txt
+++ b/test/expect/cmd.cc-missing.result.txt
diff --git a/test/expect/cmd.cc-missing-stderr.txt b/test/expect/cmd.cc-missing.stderr.txt
index fb0c343..fb0c343 100644
--- a/test/expect/cmd.cc-missing-stderr.txt
+++ b/test/expect/cmd.cc-missing.stderr.txt
diff --git a/test/expect/gccxml.broken.Class-implicit-member-bad-base-result.txt b/test/expect/cmd.cc-option.result.txt
index d00491f..d00491f 100644
--- a/test/expect/gccxml.broken.Class-implicit-member-bad-base-result.txt
+++ b/test/expect/cmd.cc-option.result.txt
diff --git a/test/expect/cmd.cc-option-stderr.txt b/test/expect/cmd.cc-option.stderr.txt
index 199d57c..199d57c 100644
--- a/test/expect/cmd.cc-option-stderr.txt
+++ b/test/expect/cmd.cc-option.stderr.txt
diff --git a/test/expect/cmd.start-missing-result.txt b/test/expect/cmd.cc-paren-castxml.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.start-missing-result.txt
+++ b/test/expect/cmd.cc-paren-castxml.result.txt
diff --git a/test/expect/cmd.cc-paren-castxml-stderr.txt b/test/expect/cmd.cc-paren-castxml.stderr.txt
index a53db2f..a53db2f 100644
--- a/test/expect/cmd.cc-paren-castxml-stderr.txt
+++ b/test/expect/cmd.cc-paren-castxml.stderr.txt
diff --git a/test/expect/cmd.rsp-o-missing-result.txt b/test/expect/cmd.cc-paren-nested.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.rsp-o-missing-result.txt
+++ b/test/expect/cmd.cc-paren-nested.result.txt
diff --git a/test/expect/cmd.cc-paren-nested-stderr.txt b/test/expect/cmd.cc-paren-nested.stderr.txt
index 5e1957c..5e1957c 100644
--- a/test/expect/cmd.cc-paren-nested-stderr.txt
+++ b/test/expect/cmd.cc-paren-nested.stderr.txt
diff --git a/test/expect/cmd.o-missing-result.txt b/test/expect/cmd.cc-paren-unbalanced.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.o-missing-result.txt
+++ b/test/expect/cmd.cc-paren-unbalanced.result.txt
diff --git a/test/expect/cmd.cc-paren-unbalanced-stderr.txt b/test/expect/cmd.cc-paren-unbalanced.stderr.txt
index 5d45f56..5d45f56 100644
--- a/test/expect/cmd.cc-paren-unbalanced-stderr.txt
+++ b/test/expect/cmd.cc-paren-unbalanced.stderr.txt
diff --git a/test/expect/cmd.gccxml-twice-result.txt b/test/expect/cmd.cc-twice.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.gccxml-twice-result.txt
+++ b/test/expect/cmd.cc-twice.result.txt
diff --git a/test/expect/cmd.cc-twice-stderr.txt b/test/expect/cmd.cc-twice.stderr.txt
index c3d3fa7..c3d3fa7 100644
--- a/test/expect/cmd.cc-twice-stderr.txt
+++ b/test/expect/cmd.cc-twice.stderr.txt
diff --git a/test/expect/cmd.gccxml-and-objc2-result.txt b/test/expect/cmd.cc-unknown.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.gccxml-and-objc2-result.txt
+++ b/test/expect/cmd.cc-unknown.result.txt
diff --git a/test/expect/cmd.cc-unknown-stderr.txt b/test/expect/cmd.cc-unknown.stderr.txt
index 5969296..5969296 100644
--- a/test/expect/cmd.cc-unknown-stderr.txt
+++ b/test/expect/cmd.cc-unknown.stderr.txt
diff --git a/test/expect/cmd.gccxml-and-objc1-result.txt b/test/expect/cmd.gccxml-and-E.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.gccxml-and-objc1-result.txt
+++ b/test/expect/cmd.gccxml-and-E.result.txt
diff --git a/test/expect/cmd.gccxml-and-E-stderr.txt b/test/expect/cmd.gccxml-and-E.stderr.txt
index f1248e4..f1248e4 100644
--- a/test/expect/cmd.gccxml-and-E-stderr.txt
+++ b/test/expect/cmd.gccxml-and-E.stderr.txt
diff --git a/test/expect/cmd.gccxml-and-c99-result.txt b/test/expect/cmd.gccxml-and-c++11.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.gccxml-and-c99-result.txt
+++ b/test/expect/cmd.gccxml-and-c++11.result.txt
diff --git a/test/expect/cmd.gccxml-and-c++11-stderr.txt b/test/expect/cmd.gccxml-and-c++11.stderr.txt
index c19941a..c19941a 100644
--- a/test/expect/cmd.gccxml-and-c++11-stderr.txt
+++ b/test/expect/cmd.gccxml-and-c++11.stderr.txt
diff --git a/test/expect/cmd.gccxml-and-c11-result.txt b/test/expect/cmd.gccxml-and-c++1y.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.gccxml-and-c11-result.txt
+++ b/test/expect/cmd.gccxml-and-c++1y.result.txt
diff --git a/test/expect/cmd.gccxml-and-c++1y-stderr.txt b/test/expect/cmd.gccxml-and-c++1y.stderr.txt
index 2505bc0..2505bc0 100644
--- a/test/expect/cmd.gccxml-and-c++1y-stderr.txt
+++ b/test/expect/cmd.gccxml-and-c++1y.stderr.txt
diff --git a/test/expect/cmd.gccxml-and-c++1y-result.txt b/test/expect/cmd.gccxml-and-c11.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.gccxml-and-c++1y-result.txt
+++ b/test/expect/cmd.gccxml-and-c11.result.txt
diff --git a/test/expect/cmd.gccxml-and-c11-stderr.txt b/test/expect/cmd.gccxml-and-c11.stderr.txt
index 16c8c53..16c8c53 100644
--- a/test/expect/cmd.gccxml-and-c11-stderr.txt
+++ b/test/expect/cmd.gccxml-and-c11.stderr.txt
diff --git a/test/expect/cmd.gccxml-and-c++11-result.txt b/test/expect/cmd.gccxml-and-c99.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.gccxml-and-c++11-result.txt
+++ b/test/expect/cmd.gccxml-and-c99.result.txt
diff --git a/test/expect/cmd.gccxml-and-c99-stderr.txt b/test/expect/cmd.gccxml-and-c99.stderr.txt
index 0f2887f..0f2887f 100644
--- a/test/expect/cmd.gccxml-and-c99-stderr.txt
+++ b/test/expect/cmd.gccxml-and-c99.stderr.txt
diff --git a/test/expect/cmd.gccxml-and-E-result.txt b/test/expect/cmd.gccxml-and-objc1.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.gccxml-and-E-result.txt
+++ b/test/expect/cmd.gccxml-and-objc1.result.txt
diff --git a/test/expect/cmd.gccxml-and-objc2-stderr.txt b/test/expect/cmd.gccxml-and-objc1.stderr.txt
index 55d2e80..55d2e80 100644
--- a/test/expect/cmd.gccxml-and-objc2-stderr.txt
+++ b/test/expect/cmd.gccxml-and-objc1.stderr.txt
diff --git a/test/expect/cmd.cc-unknown-result.txt b/test/expect/cmd.gccxml-and-objc2.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.cc-unknown-result.txt
+++ b/test/expect/cmd.gccxml-and-objc2.result.txt
diff --git a/test/expect/cmd.gccxml-and-objc1-stderr.txt b/test/expect/cmd.gccxml-and-objc2.stderr.txt
index 55d2e80..55d2e80 100644
--- a/test/expect/cmd.gccxml-and-objc1-stderr.txt
+++ b/test/expect/cmd.gccxml-and-objc2.stderr.txt
diff --git a/test/expect/gccxml.broken.Class-implicit-member-bad-base-stdout.txt b/test/expect/cmd.gccxml-empty-c++98.stderr.txt
index 10f3293..10f3293 100644
--- a/test/expect/gccxml.broken.Class-implicit-member-bad-base-stdout.txt
+++ b/test/expect/cmd.gccxml-empty-c++98.stderr.txt
diff --git a/test/expect/cmd.version-stderr.txt b/test/expect/cmd.gccxml-empty-c++98.stdout.txt
index 10f3293..10f3293 100644
--- a/test/expect/cmd.version-stderr.txt
+++ b/test/expect/cmd.gccxml-empty-c++98.stdout.txt
diff --git a/test/expect/cmd.cc-twice-result.txt b/test/expect/cmd.gccxml-twice.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.cc-twice-result.txt
+++ b/test/expect/cmd.gccxml-twice.result.txt
diff --git a/test/expect/cmd.gccxml-twice-stderr.txt b/test/expect/cmd.gccxml-twice.stderr.txt
index 1d597ac..1d597ac 100644
--- a/test/expect/cmd.gccxml-twice-stderr.txt
+++ b/test/expect/cmd.gccxml-twice.stderr.txt
diff --git a/test/expect/cmd.rsp-empty-stdout.txt b/test/expect/cmd.help1.stderr.txt
index 10f3293..10f3293 100644
--- a/test/expect/cmd.rsp-empty-stdout.txt
+++ b/test/expect/cmd.help1.stderr.txt
diff --git a/test/expect/cmd.help2-stdout.txt b/test/expect/cmd.help1.stdout.txt
index 9b47306..9b47306 100644
--- a/test/expect/cmd.help2-stdout.txt
+++ b/test/expect/cmd.help1.stdout.txt
diff --git a/test/expect/cmd.rsp-empty-stderr.txt b/test/expect/cmd.help2.stderr.txt
index 10f3293..10f3293 100644
--- a/test/expect/cmd.rsp-empty-stderr.txt
+++ b/test/expect/cmd.help2.stderr.txt
diff --git a/test/expect/cmd.help1-stdout.txt b/test/expect/cmd.help2.stdout.txt
index 9b47306..9b47306 100644
--- a/test/expect/cmd.help1-stdout.txt
+++ b/test/expect/cmd.help2.stdout.txt
diff --git a/test/expect/cmd.no-arguments-stdout.txt b/test/expect/cmd.no-arguments.stderr.txt
index 10f3293..10f3293 100644
--- a/test/expect/cmd.no-arguments-stdout.txt
+++ b/test/expect/cmd.no-arguments.stderr.txt
diff --git a/test/expect/cmd.no-arguments-stderr.txt b/test/expect/cmd.no-arguments.stdout.txt
index 10f3293..10f3293 100644
--- a/test/expect/cmd.no-arguments-stderr.txt
+++ b/test/expect/cmd.no-arguments.stdout.txt
diff --git a/test/expect/cmd.cc-paren-unbalanced-result.txt b/test/expect/cmd.o-missing.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.cc-paren-unbalanced-result.txt
+++ b/test/expect/cmd.o-missing.result.txt
diff --git a/test/expect/cmd.rsp-o-missing-stderr.txt b/test/expect/cmd.o-missing.stderr.txt
index 6455bd9..6455bd9 100644
--- a/test/expect/cmd.rsp-o-missing-stderr.txt
+++ b/test/expect/cmd.o-missing.stderr.txt
diff --git a/test/expect/cmd.help2-stderr.txt b/test/expect/cmd.rsp-empty.stderr.txt
index 10f3293..10f3293 100644
--- a/test/expect/cmd.help2-stderr.txt
+++ b/test/expect/cmd.rsp-empty.stderr.txt
diff --git a/test/expect/cmd.help1-stderr.txt b/test/expect/cmd.rsp-empty.stdout.txt
index 10f3293..10f3293 100644
--- a/test/expect/cmd.help1-stderr.txt
+++ b/test/expect/cmd.rsp-empty.stdout.txt
diff --git a/test/expect/cmd.rsp-missing-stderr.txt b/test/expect/cmd.rsp-missing.stderr.txt
index a84a0fa..a84a0fa 100644
--- a/test/expect/cmd.rsp-missing-stderr.txt
+++ b/test/expect/cmd.rsp-missing.stderr.txt
diff --git a/test/expect/cmd.cc-paren-nested-result.txt b/test/expect/cmd.rsp-o-missing.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.cc-paren-nested-result.txt
+++ b/test/expect/cmd.rsp-o-missing.result.txt
diff --git a/test/expect/cmd.o-missing-stderr.txt b/test/expect/cmd.rsp-o-missing.stderr.txt
index 6455bd9..6455bd9 100644
--- a/test/expect/cmd.o-missing-stderr.txt
+++ b/test/expect/cmd.rsp-o-missing.stderr.txt
diff --git a/test/expect/cmd.cc-paren-castxml-result.txt b/test/expect/cmd.start-missing.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.cc-paren-castxml-result.txt
+++ b/test/expect/cmd.start-missing.result.txt
diff --git a/test/expect/cmd.start-missing-stderr.txt b/test/expect/cmd.start-missing.stderr.txt
index 81e1d75..81e1d75 100644
--- a/test/expect/cmd.start-missing-stderr.txt
+++ b/test/expect/cmd.start-missing.stderr.txt
diff --git a/test/expect/cmd.gccxml-empty-c++98-stdout.txt b/test/expect/cmd.version.stderr.txt
index 10f3293..10f3293 100644
--- a/test/expect/cmd.gccxml-empty-c++98-stdout.txt
+++ b/test/expect/cmd.version.stderr.txt
diff --git a/test/expect/cmd.version-stdout.txt b/test/expect/cmd.version.stdout.txt
index 1cf9902..1cf9902 100644
--- a/test/expect/cmd.version-stdout.txt
+++ b/test/expect/cmd.version.stdout.txt
diff --git a/test/expect/gccxml.ArrayType-incomplete-xml.txt b/test/expect/gccxml.any.ArrayType-incomplete.xml.txt
index d0203e9..d0203e9 100644
--- a/test/expect/gccxml.ArrayType-incomplete-xml.txt
+++ b/test/expect/gccxml.any.ArrayType-incomplete.xml.txt
diff --git a/test/expect/gccxml.ArrayType-xml.txt b/test/expect/gccxml.any.ArrayType.xml.txt
index e48bd3d..e48bd3d 100644
--- a/test/expect/gccxml.ArrayType-xml.txt
+++ b/test/expect/gccxml.any.ArrayType.xml.txt
diff --git a/test/expect/gccxml.Class-abstract-xml.txt b/test/expect/gccxml.any.Class-abstract.xml.txt
index 3ffcd9d..3ffcd9d 100644
--- a/test/expect/gccxml.Class-abstract-xml.txt
+++ b/test/expect/gccxml.any.Class-abstract.xml.txt
diff --git a/test/expect/gccxml.Class-base-typedef-xml.txt b/test/expect/gccxml.any.Class-base-typedef.xml.txt
index 9188b97..9188b97 100644
--- a/test/expect/gccxml.Class-base-typedef-xml.txt
+++ b/test/expect/gccxml.any.Class-base-typedef.xml.txt
diff --git a/test/expect/gccxml.Class-bases-xml.txt b/test/expect/gccxml.any.Class-bases.xml.txt
index f650a84..f650a84 100644
--- a/test/expect/gccxml.Class-bases-xml.txt
+++ b/test/expect/gccxml.any.Class-bases.xml.txt
diff --git a/test/expect/gccxml.Class-forward-xml.txt b/test/expect/gccxml.any.Class-forward.xml.txt
index 6d8f463..6d8f463 100644
--- a/test/expect/gccxml.Class-forward-xml.txt
+++ b/test/expect/gccxml.any.Class-forward.xml.txt
diff --git a/test/expect/gccxml.Class-friends-xml.txt b/test/expect/gccxml.any.Class-friends.xml.txt
index 8a94e77..8a94e77 100644
--- a/test/expect/gccxml.Class-friends-xml.txt
+++ b/test/expect/gccxml.any.Class-friends.xml.txt
diff --git a/test/expect/gccxml.Class-implicit-member-access-mutable-xml.txt b/test/expect/gccxml.any.Class-implicit-member-access-mutable.xml.txt
index 8e610e8..8e610e8 100644
--- a/test/expect/gccxml.Class-implicit-member-access-mutable-xml.txt
+++ b/test/expect/gccxml.any.Class-implicit-member-access-mutable.xml.txt
diff --git a/test/expect/gccxml.Class-implicit-member-access-xml.txt b/test/expect/gccxml.any.Class-implicit-member-access.xml.txt
index d3681b0..d3681b0 100644
--- a/test/expect/gccxml.Class-implicit-member-access-xml.txt
+++ b/test/expect/gccxml.any.Class-implicit-member-access.xml.txt
diff --git a/test/expect/gccxml.Class-implicit-member-array-xml.txt b/test/expect/gccxml.any.Class-implicit-member-array.xml.txt
index f6eac01..f6eac01 100644
--- a/test/expect/gccxml.Class-implicit-member-array-xml.txt
+++ b/test/expect/gccxml.any.Class-implicit-member-array.xml.txt
diff --git a/test/expect/gccxml.Class-implicit-member-const-xml.txt b/test/expect/gccxml.any.Class-implicit-member-const.xml.txt
index 8accf1a..8accf1a 100644
--- a/test/expect/gccxml.Class-implicit-member-const-xml.txt
+++ b/test/expect/gccxml.any.Class-implicit-member-const.xml.txt
diff --git a/test/expect/gccxml.Class-implicit-member-reference-xml.txt b/test/expect/gccxml.any.Class-implicit-member-reference.xml.txt
index 72b0862..72b0862 100644
--- a/test/expect/gccxml.Class-implicit-member-reference-xml.txt
+++ b/test/expect/gccxml.any.Class-implicit-member-reference.xml.txt
diff --git a/test/expect/gccxml.Class-implicit-members-xml.txt b/test/expect/gccxml.any.Class-implicit-members.xml.txt
index 58aed61..58aed61 100644
--- a/test/expect/gccxml.Class-implicit-members-xml.txt
+++ b/test/expect/gccxml.any.Class-implicit-members.xml.txt
diff --git a/test/expect/gccxml.Class-incomplete-twice-xml.txt b/test/expect/gccxml.any.Class-incomplete-twice.xml.txt
index ece58ff..ece58ff 100644
--- a/test/expect/gccxml.Class-incomplete-twice-xml.txt
+++ b/test/expect/gccxml.any.Class-incomplete-twice.xml.txt
diff --git a/test/expect/gccxml.Class-incomplete-xml.txt b/test/expect/gccxml.any.Class-incomplete.xml.txt
index 62bb502..62bb502 100644
--- a/test/expect/gccxml.Class-incomplete-xml.txt
+++ b/test/expect/gccxml.any.Class-incomplete.xml.txt
diff --git a/test/expect/gccxml.Class-member-template-xml.txt b/test/expect/gccxml.any.Class-member-template.xml.txt
index 487aebb..487aebb 100644
--- a/test/expect/gccxml.Class-member-template-xml.txt
+++ b/test/expect/gccxml.any.Class-member-template.xml.txt
diff --git a/test/expect/gccxml.Class-template-Method-Argument-default-xml.txt b/test/expect/gccxml.any.Class-template-Method-Argument-default.xml.txt
index 7d84d18..7d84d18 100644
--- a/test/expect/gccxml.Class-template-Method-Argument-default-xml.txt
+++ b/test/expect/gccxml.any.Class-template-Method-Argument-default.xml.txt
diff --git a/test/expect/gccxml.Class-template-bases-xml.txt b/test/expect/gccxml.any.Class-template-bases.xml.txt
index 332f7c0..332f7c0 100644
--- a/test/expect/gccxml.Class-template-bases-xml.txt
+++ b/test/expect/gccxml.any.Class-template-bases.xml.txt
diff --git a/test/expect/gccxml.Class-template-friends-xml.txt b/test/expect/gccxml.any.Class-template-friends.xml.txt
index 8bcd543..8bcd543 100644
--- a/test/expect/gccxml.Class-template-friends-xml.txt
+++ b/test/expect/gccxml.any.Class-template-friends.xml.txt
diff --git a/test/expect/gccxml.Class-template-member-Typedef-xml.txt b/test/expect/gccxml.any.Class-template-member-Typedef.xml.txt
index 6458460..6458460 100644
--- a/test/expect/gccxml.Class-template-member-Typedef-xml.txt
+++ b/test/expect/gccxml.any.Class-template-member-Typedef.xml.txt
diff --git a/test/expect/gccxml.Class-template-member-template-xml.txt b/test/expect/gccxml.any.Class-template-member-template.xml.txt
index 42c7790..42c7790 100644
--- a/test/expect/gccxml.Class-template-member-template-xml.txt
+++ b/test/expect/gccxml.any.Class-template-member-template.xml.txt
diff --git a/test/expect/gccxml.Class-template-xml.txt b/test/expect/gccxml.any.Class-template.xml.txt
index b2cd410..b2cd410 100644
--- a/test/expect/gccxml.Class-template-xml.txt
+++ b/test/expect/gccxml.any.Class-template.xml.txt
diff --git a/test/expect/gccxml.Class-xml.txt b/test/expect/gccxml.any.Class.xml.txt
index 34ded81..34ded81 100644
--- a/test/expect/gccxml.Class-xml.txt
+++ b/test/expect/gccxml.any.Class.xml.txt
diff --git a/test/expect/gccxml.CvQualifiedType-xml.txt b/test/expect/gccxml.any.CvQualifiedType.xml.txt
index 4a8d9c4..4a8d9c4 100644
--- a/test/expect/gccxml.CvQualifiedType-xml.txt
+++ b/test/expect/gccxml.any.CvQualifiedType.xml.txt
diff --git a/test/expect/gccxml.Enumeration-anonymous-xml.txt b/test/expect/gccxml.any.Enumeration-anonymous.xml.txt
index 385975b..385975b 100644
--- a/test/expect/gccxml.Enumeration-anonymous-xml.txt
+++ b/test/expect/gccxml.any.Enumeration-anonymous.xml.txt
diff --git a/test/expect/gccxml.Enumeration-xml.txt b/test/expect/gccxml.any.Enumeration.xml.txt
index b620c86..b620c86 100644
--- a/test/expect/gccxml.Enumeration-xml.txt
+++ b/test/expect/gccxml.any.Enumeration.xml.txt
diff --git a/test/expect/gccxml.Field-xml.txt b/test/expect/gccxml.any.Field.xml.txt
index 41cd156..41cd156 100644
--- a/test/expect/gccxml.Field-xml.txt
+++ b/test/expect/gccxml.any.Field.xml.txt
diff --git a/test/expect/gccxml.Function-Argument-decay-xml.txt b/test/expect/gccxml.any.Function-Argument-decay.xml.txt
index d295f6d..d295f6d 100644
--- a/test/expect/gccxml.Function-Argument-decay-xml.txt
+++ b/test/expect/gccxml.any.Function-Argument-decay.xml.txt
diff --git a/test/expect/gccxml.Function-Argument-default-xml.txt b/test/expect/gccxml.any.Function-Argument-default.xml.txt
index 8160551..8160551 100644
--- a/test/expect/gccxml.Function-Argument-default-xml.txt
+++ b/test/expect/gccxml.any.Function-Argument-default.xml.txt
diff --git a/test/expect/gccxml.Function-template-xml.txt b/test/expect/gccxml.any.Function-template.xml.txt
index e503865..e503865 100644
--- a/test/expect/gccxml.Function-template-xml.txt
+++ b/test/expect/gccxml.any.Function-template.xml.txt
diff --git a/test/expect/gccxml.Function-throw-xml.txt b/test/expect/gccxml.any.Function-throw.xml.txt
index 7be0b22..7be0b22 100644
--- a/test/expect/gccxml.Function-throw-xml.txt
+++ b/test/expect/gccxml.any.Function-throw.xml.txt
diff --git a/test/expect/gccxml.Function-variadic-xml.txt b/test/expect/gccxml.any.Function-variadic.xml.txt
index cd75d0f..cd75d0f 100644
--- a/test/expect/gccxml.Function-variadic-xml.txt
+++ b/test/expect/gccxml.any.Function-variadic.xml.txt
diff --git a/test/expect/gccxml.Function-xml.txt b/test/expect/gccxml.any.Function.xml.txt
index 51931a8..51931a8 100644
--- a/test/expect/gccxml.Function-xml.txt
+++ b/test/expect/gccxml.any.Function.xml.txt
diff --git a/test/expect/gccxml.FunctionType-variadic-xml.txt b/test/expect/gccxml.any.FunctionType-variadic.xml.txt
index f13d334..f13d334 100644
--- a/test/expect/gccxml.FunctionType-variadic-xml.txt
+++ b/test/expect/gccxml.any.FunctionType-variadic.xml.txt
diff --git a/test/expect/gccxml.FunctionType-xml.txt b/test/expect/gccxml.any.FunctionType.xml.txt
index 9e05ce6..9e05ce6 100644
--- a/test/expect/gccxml.FunctionType-xml.txt
+++ b/test/expect/gccxml.any.FunctionType.xml.txt
diff --git a/test/expect/gccxml.FundamentalType-xml.txt b/test/expect/gccxml.any.FundamentalType.xml.txt
index 29a48b2..29a48b2 100644
--- a/test/expect/gccxml.FundamentalType-xml.txt
+++ b/test/expect/gccxml.any.FundamentalType.xml.txt
diff --git a/test/expect/gccxml.FundamentalTypes-xml.txt b/test/expect/gccxml.any.FundamentalTypes.xml.txt
index 6bd2561..6bd2561 100644
--- a/test/expect/gccxml.FundamentalTypes-xml.txt
+++ b/test/expect/gccxml.any.FundamentalTypes.xml.txt
diff --git a/test/expect/gccxml.Method-xml.txt b/test/expect/gccxml.any.Method.xml.txt
index 1ae4a4b..1ae4a4b 100644
--- a/test/expect/gccxml.Method-xml.txt
+++ b/test/expect/gccxml.any.Method.xml.txt
diff --git a/test/expect/gccxml.MethodType-cv-xml.txt b/test/expect/gccxml.any.MethodType-cv.xml.txt
index eaa84ca..eaa84ca 100644
--- a/test/expect/gccxml.MethodType-cv-xml.txt
+++ b/test/expect/gccxml.any.MethodType-cv.xml.txt
diff --git a/test/expect/gccxml.MethodType-xml.txt b/test/expect/gccxml.any.MethodType.xml.txt
index dae67b0..dae67b0 100644
--- a/test/expect/gccxml.MethodType-xml.txt
+++ b/test/expect/gccxml.any.MethodType.xml.txt
diff --git a/test/expect/gccxml.Namespace-Class-members-xml.txt b/test/expect/gccxml.any.Namespace-Class-members.xml.txt
index 44146be..44146be 100644
--- a/test/expect/gccxml.Namespace-Class-members-xml.txt
+++ b/test/expect/gccxml.any.Namespace-Class-members.xml.txt
diff --git a/test/expect/gccxml.using-directive-ns-xml.txt b/test/expect/gccxml.any.Namespace-Class-template-members.xml.txt
index 763161e..763161e 100644
--- a/test/expect/gccxml.using-directive-ns-xml.txt
+++ b/test/expect/gccxml.any.Namespace-Class-template-members.xml.txt
diff --git a/test/expect/gccxml.Namespace-xml.txt b/test/expect/gccxml.any.Namespace-Function-template-members.xml.txt
index 763161e..763161e 100644
--- a/test/expect/gccxml.Namespace-xml.txt
+++ b/test/expect/gccxml.any.Namespace-Function-template-members.xml.txt
diff --git a/test/expect/gccxml.Namespace-empty-xml.txt b/test/expect/gccxml.any.Namespace-empty.xml.txt
index 763161e..763161e 100644
--- a/test/expect/gccxml.Namespace-empty-xml.txt
+++ b/test/expect/gccxml.any.Namespace-empty.xml.txt
diff --git a/test/expect/gccxml.Namespace-Function-template-members-xml.txt b/test/expect/gccxml.any.Namespace.xml.txt
index 763161e..763161e 100644
--- a/test/expect/gccxml.Namespace-Function-template-members-xml.txt
+++ b/test/expect/gccxml.any.Namespace.xml.txt
diff --git a/test/expect/gccxml.OffsetType-cv-xml.txt b/test/expect/gccxml.any.OffsetType-cv.xml.txt
index 7b849dc..7b849dc 100644
--- a/test/expect/gccxml.OffsetType-cv-xml.txt
+++ b/test/expect/gccxml.any.OffsetType-cv.xml.txt
diff --git a/test/expect/gccxml.OffsetType-xml.txt b/test/expect/gccxml.any.OffsetType.xml.txt
index 5a4c63e..5a4c63e 100644
--- a/test/expect/gccxml.OffsetType-xml.txt
+++ b/test/expect/gccxml.any.OffsetType.xml.txt
diff --git a/test/expect/gccxml.OperatorFunction-xml.txt b/test/expect/gccxml.any.OperatorFunction.xml.txt
index d53e058..d53e058 100644
--- a/test/expect/gccxml.OperatorFunction-xml.txt
+++ b/test/expect/gccxml.any.OperatorFunction.xml.txt
diff --git a/test/expect/gccxml.OperatorMethod-xml.txt b/test/expect/gccxml.any.OperatorMethod.xml.txt
index 8f8ef87..8f8ef87 100644
--- a/test/expect/gccxml.OperatorMethod-xml.txt
+++ b/test/expect/gccxml.any.OperatorMethod.xml.txt
diff --git a/test/expect/gccxml.PointerType-xml.txt b/test/expect/gccxml.any.PointerType.xml.txt
index 1f9f894..1f9f894 100644
--- a/test/expect/gccxml.PointerType-xml.txt
+++ b/test/expect/gccxml.any.PointerType.xml.txt
diff --git a/test/expect/gccxml.ReferenceType-xml.txt b/test/expect/gccxml.any.ReferenceType.xml.txt
index ec38243..ec38243 100644
--- a/test/expect/gccxml.ReferenceType-xml.txt
+++ b/test/expect/gccxml.any.ReferenceType.xml.txt
diff --git a/test/expect/gccxml.Typedef-paren-xml.txt b/test/expect/gccxml.any.Typedef-paren.xml.txt
index 8e70624..8e70624 100644
--- a/test/expect/gccxml.Typedef-paren-xml.txt
+++ b/test/expect/gccxml.any.Typedef-paren.xml.txt
diff --git a/test/expect/gccxml.Typedef-to-Class-template-xml.txt b/test/expect/gccxml.any.Typedef-to-Class-template.xml.txt
index 3e6f75d..3e6f75d 100644
--- a/test/expect/gccxml.Typedef-to-Class-template-xml.txt
+++ b/test/expect/gccxml.any.Typedef-to-Class-template.xml.txt
diff --git a/test/expect/gccxml.Typedef-to-Enumeration-anonymous-xml.txt b/test/expect/gccxml.any.Typedef-to-Enumeration-anonymous.xml.txt
index bb21d49..bb21d49 100644
--- a/test/expect/gccxml.Typedef-to-Enumeration-anonymous-xml.txt
+++ b/test/expect/gccxml.any.Typedef-to-Enumeration-anonymous.xml.txt
diff --git a/test/expect/gccxml.Typedef-to-Enumeration-xml.txt b/test/expect/gccxml.any.Typedef-to-Enumeration.xml.txt
index 1e8ec8f..1e8ec8f 100644
--- a/test/expect/gccxml.Typedef-to-Enumeration-xml.txt
+++ b/test/expect/gccxml.any.Typedef-to-Enumeration.xml.txt
diff --git a/test/expect/gccxml.Typedef-to-FundamentalType-mode-xml.txt b/test/expect/gccxml.any.Typedef-to-FundamentalType-mode.xml.txt
index c43eca1..c43eca1 100644
--- a/test/expect/gccxml.Typedef-to-FundamentalType-mode-xml.txt
+++ b/test/expect/gccxml.any.Typedef-to-FundamentalType-mode.xml.txt
diff --git a/test/expect/gccxml.Typedef-to-extern-C-FundamentalType-mode-xml.txt b/test/expect/gccxml.any.Typedef-to-extern-C-FundamentalType-mode.xml.txt
index 5882ed8..5882ed8 100644
--- a/test/expect/gccxml.Typedef-to-extern-C-FundamentalType-mode-xml.txt
+++ b/test/expect/gccxml.any.Typedef-to-extern-C-FundamentalType-mode.xml.txt
diff --git a/test/expect/gccxml.Variable-in-Class-xml.txt b/test/expect/gccxml.any.Variable-in-Class.xml.txt
index ed21fda..ed21fda 100644
--- a/test/expect/gccxml.Variable-in-Class-xml.txt
+++ b/test/expect/gccxml.any.Variable-in-Class.xml.txt
diff --git a/test/expect/gccxml.Variable-init-xml.txt b/test/expect/gccxml.any.Variable-init.xml.txt
index 7eb4cf5..7eb4cf5 100644
--- a/test/expect/gccxml.Variable-init-xml.txt
+++ b/test/expect/gccxml.any.Variable-init.xml.txt
diff --git a/test/expect/gccxml.Variable-xml.txt b/test/expect/gccxml.any.Variable.xml.txt
index 9a8c125..9a8c125 100644
--- a/test/expect/gccxml.Variable-xml.txt
+++ b/test/expect/gccxml.any.Variable.xml.txt
diff --git a/test/expect/gccxml.qualified-type-name-xml.txt b/test/expect/gccxml.any.qualified-type-name.xml.txt
index fbc36d1..fbc36d1 100644
--- a/test/expect/gccxml.qualified-type-name-xml.txt
+++ b/test/expect/gccxml.any.qualified-type-name.xml.txt
diff --git a/test/expect/gccxml.using-declaration-class-xml.txt b/test/expect/gccxml.any.using-declaration-class.xml.txt
index 4ba114d..4ba114d 100644
--- a/test/expect/gccxml.using-declaration-class-xml.txt
+++ b/test/expect/gccxml.any.using-declaration-class.xml.txt
diff --git a/test/expect/gccxml.using-declaration-ns-xml.txt b/test/expect/gccxml.any.using-declaration-ns.xml.txt
index ebe6655..ebe6655 100644
--- a/test/expect/gccxml.using-declaration-ns-xml.txt
+++ b/test/expect/gccxml.any.using-declaration-ns.xml.txt
diff --git a/test/expect/gccxml.using-declaration-start-xml.txt b/test/expect/gccxml.any.using-declaration-start.xml.txt
index ce8242d..ce8242d 100644
--- a/test/expect/gccxml.using-declaration-start-xml.txt
+++ b/test/expect/gccxml.any.using-declaration-start.xml.txt
diff --git a/test/expect/gccxml.Namespace-Class-template-members-xml.txt b/test/expect/gccxml.any.using-directive-ns.xml.txt
index 763161e..763161e 100644
--- a/test/expect/gccxml.Namespace-Class-template-members-xml.txt
+++ b/test/expect/gccxml.any.using-directive-ns.xml.txt
diff --git a/test/expect/gccxml.using-directive-start-xml.txt b/test/expect/gccxml.any.using-directive-start.xml.txt
index 9e5aacd..9e5aacd 100644
--- a/test/expect/gccxml.using-directive-start-xml.txt
+++ b/test/expect/gccxml.any.using-directive-start.xml.txt
diff --git a/test/expect/cmd.cc-option-result.txt b/test/expect/gccxml.broken.any.Class-implicit-member-bad-base.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.cc-option-result.txt
+++ b/test/expect/gccxml.broken.any.Class-implicit-member-bad-base.result.txt
diff --git a/test/expect/gccxml.broken.Class-implicit-member-bad-base-stderr.txt b/test/expect/gccxml.broken.any.Class-implicit-member-bad-base.stderr.txt
index 7f45214..7f45214 100644
--- a/test/expect/gccxml.broken.Class-implicit-member-bad-base-stderr.txt
+++ b/test/expect/gccxml.broken.any.Class-implicit-member-bad-base.stderr.txt
diff --git a/test/expect/cmd.gccxml-empty-c++98-stderr.txt b/test/expect/gccxml.broken.any.Class-implicit-member-bad-base.stdout.txt
index 10f3293..10f3293 100644
--- a/test/expect/cmd.gccxml-empty-c++98-stderr.txt
+++ b/test/expect/gccxml.broken.any.Class-implicit-member-bad-base.stdout.txt
diff --git a/test/expect/gccxml.broken.Class-template-constructor-template-xml.txt b/test/expect/gccxml.broken.any.Class-template-constructor-template.xml.txt
index 8fa2b4b..8fa2b4b 100644
--- a/test/expect/gccxml.broken.Class-template-constructor-template-xml.txt
+++ b/test/expect/gccxml.broken.any.Class-template-constructor-template.xml.txt
diff --git a/test/expect/gccxml.broken.ReferenceType-to-Class-template-xml.txt b/test/expect/gccxml.broken.any.ReferenceType-to-Class-template.xml.txt
index 6c01a34..6c01a34 100644
--- a/test/expect/gccxml.broken.ReferenceType-to-Class-template-xml.txt
+++ b/test/expect/gccxml.broken.any.ReferenceType-to-Class-template.xml.txt
diff --git a/test/expect/gccxml.c.FundamentalType-xml.txt b/test/expect/gccxml.c89.FundamentalType.xml.txt
index 6fe4c46..6fe4c46 100644
--- a/test/expect/gccxml.c.FundamentalType-xml.txt
+++ b/test/expect/gccxml.c89.FundamentalType.xml.txt
diff --git a/test/expect/gccxml.c.Typedef-called-class-xml.txt b/test/expect/gccxml.c89.Typedef-called-class.xml.txt
index 023418e..023418e 100644
--- a/test/expect/gccxml.c.Typedef-called-class-xml.txt
+++ b/test/expect/gccxml.c89.Typedef-called-class.xml.txt
diff --git a/test/expect/cmd.cc-missing-result.txt b/test/expect/gccxml.c89.invalid.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.cc-missing-result.txt
+++ b/test/expect/gccxml.c89.invalid.result.txt
diff --git a/test/expect/gccxml.c.invalid-stderr.txt b/test/expect/gccxml.c89.invalid.stderr.txt
index 73c9062..73c9062 100644
--- a/test/expect/gccxml.c.invalid-stderr.txt
+++ b/test/expect/gccxml.c89.invalid.stderr.txt
diff --git a/test/run.cmake b/test/run.cmake
index 560327e..854cf8c 100644
--- a/test/run.cmake
+++ b/test/run.cmake
@@ -47,8 +47,8 @@ foreach(o result stdout stderr ${maybe_xml})
   set(expect-${o} "")
   unset(expect_${o})
   foreach(e ${expect})
-    if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/expect/${e}-${o}.txt)
-      file(READ ${CMAKE_CURRENT_LIST_DIR}/expect/${e}-${o}.txt expect_${o})
+    if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/expect/${e}.${o}.txt)
+      file(READ ${CMAKE_CURRENT_LIST_DIR}/expect/${e}.${o}.txt expect_${o})
       break()
     endif()
   endforeach()