test: Rename 'castxml_test_{gccxml => output}' to be less-specific

These test cover the output, but the test infrastructure does not care
which format.

1 files changed, 220 insertions, 220 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1bf4613..568188c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -34,14 +34,14 @@ macro(castxml_test_cmd test)
     )
 endmacro()
 
-macro(castxml_test_gccxml_common prefix ext std test)
-  if(DEFINED castxml_test_gccxml_custom_start)
-    set(_castxml_start ${castxml_test_gccxml_custom_start})
+macro(castxml_test_output_common prefix ext std test)
+  if(DEFINED castxml_test_output_custom_start)
+    set(_castxml_start ${castxml_test_output_custom_start})
   else()
     set(_castxml_start --castxml-start start)
   endif()
-  if(castxml_test_gccxml_custom_input)
-    set(_castxml_input ${castxml_test_gccxml_custom_input})
+  if(castxml_test_output_custom_input)
+    set(_castxml_input ${castxml_test_output_custom_input})
   else()
     set(_castxml_input ${test})
   endif()
@@ -59,7 +59,7 @@ macro(castxml_test_gccxml_common prefix ext std test)
     -std=${std}
     ${CMAKE_CURRENT_LIST_DIR}/input/${_castxml_input}.${ext}
     -o ${prefix}.${std}.${test}.xml
-    ${castxml_test_gccxml_extra_arguments}
+    ${castxml_test_output_extra_arguments}
     )
   add_test(
     NAME ${prefix}.${std}.${test}
@@ -72,103 +72,103 @@ macro(castxml_test_gccxml_common prefix ext std test)
     )
 endmacro()
 
-macro(castxml_test_gccxml_c89 test)
-  castxml_test_gccxml_common(gccxml c c89 ${test})
+macro(castxml_test_output_c89 test)
+  castxml_test_output_common(gccxml c c89 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_c99 test)
-  castxml_test_gccxml_common(gccxml c c99 ${test})
+macro(castxml_test_output_c99 test)
+  castxml_test_output_common(gccxml c c99 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_c11 test)
-  castxml_test_gccxml_common(gccxml c c11 ${test})
+macro(castxml_test_output_c11 test)
+  castxml_test_output_common(gccxml c c11 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_gnu89 test)
-  castxml_test_gccxml_common(gccxml c gnu89 ${test})
+macro(castxml_test_output_gnu89 test)
+  castxml_test_output_common(gccxml c gnu89 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_gnu99 test)
-  castxml_test_gccxml_common(gccxml c gnu99 ${test})
+macro(castxml_test_output_gnu99 test)
+  castxml_test_output_common(gccxml c gnu99 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_gnu11 test)
-  castxml_test_gccxml_common(gccxml c gnu11 ${test})
+macro(castxml_test_output_gnu11 test)
+  castxml_test_output_common(gccxml c gnu11 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_cxx98 test)
-  castxml_test_gccxml_common(gccxml cxx c++98 ${test})
+macro(castxml_test_output_cxx98 test)
+  castxml_test_output_common(gccxml cxx c++98 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_gnuxx98 test)
-  castxml_test_gccxml_common(gccxml cxx gnu++98 ${test})
+macro(castxml_test_output_gnuxx98 test)
+  castxml_test_output_common(gccxml cxx gnu++98 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_cxx11 test)
-  castxml_test_gccxml_common(gccxml cxx c++11 ${test})
+macro(castxml_test_output_cxx11 test)
+  castxml_test_output_common(gccxml cxx c++11 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_gnuxx11 test)
-  castxml_test_gccxml_common(gccxml cxx gnu++11 ${test})
+macro(castxml_test_output_gnuxx11 test)
+  castxml_test_output_common(gccxml cxx gnu++11 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_cxx14 test)
-  castxml_test_gccxml_common(gccxml cxx c++14 ${test})
+macro(castxml_test_output_cxx14 test)
+  castxml_test_output_common(gccxml cxx c++14 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_gnuxx14 test)
-  castxml_test_gccxml_common(gccxml cxx gnu++14 ${test})
+macro(castxml_test_output_gnuxx14 test)
+  castxml_test_output_common(gccxml cxx gnu++14 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_broken_cxx98 test)
-  castxml_test_gccxml_common(gccxml.broken cxx c++98 ${test})
+macro(castxml_test_output_broken_cxx98 test)
+  castxml_test_output_common(gccxml.broken cxx c++98 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_broken_gnuxx98 test)
-  castxml_test_gccxml_common(gccxml.broken cxx gnu++98 ${test})
+macro(castxml_test_output_broken_gnuxx98 test)
+  castxml_test_output_common(gccxml.broken cxx gnu++98 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_broken_cxx11 test)
-  castxml_test_gccxml_common(gccxml.broken cxx c++11 ${test})
+macro(castxml_test_output_broken_cxx11 test)
+  castxml_test_output_common(gccxml.broken cxx c++11 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_broken_gnuxx11 test)
-  castxml_test_gccxml_common(gccxml.broken cxx gnu++11 ${test})
+macro(castxml_test_output_broken_gnuxx11 test)
+  castxml_test_output_common(gccxml.broken cxx gnu++11 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_broken_cxx14 test)
-  castxml_test_gccxml_common(gccxml.broken cxx c++14 ${test})
+macro(castxml_test_output_broken_cxx14 test)
+  castxml_test_output_common(gccxml.broken cxx c++14 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_broken_gnuxx14 test)
-  castxml_test_gccxml_common(gccxml.broken cxx gnu++14 ${test})
+macro(castxml_test_output_broken_gnuxx14 test)
+  castxml_test_output_common(gccxml.broken cxx gnu++14 ${test})
 endmacro()
 
-macro(castxml_test_gccxml_c test)
-  castxml_test_gccxml_c89(${test})
-  castxml_test_gccxml_gnu89(${test})
-  castxml_test_gccxml_c99(${test})
-  castxml_test_gccxml_gnu99(${test})
-  castxml_test_gccxml_c11(${test})
-  castxml_test_gccxml_gnu11(${test})
+macro(castxml_test_output_c test)
+  castxml_test_output_c89(${test})
+  castxml_test_output_gnu89(${test})
+  castxml_test_output_c99(${test})
+  castxml_test_output_gnu99(${test})
+  castxml_test_output_c11(${test})
+  castxml_test_output_gnu11(${test})
 endmacro()
 
-macro(castxml_test_gccxml test)
-  castxml_test_gccxml_cxx98(${test})
-  castxml_test_gccxml_gnuxx98(${test})
-  castxml_test_gccxml_cxx11(${test})
-  castxml_test_gccxml_gnuxx11(${test})
-  castxml_test_gccxml_cxx14(${test})
-  castxml_test_gccxml_gnuxx14(${test})
+macro(castxml_test_output test)
+  castxml_test_output_cxx98(${test})
+  castxml_test_output_gnuxx98(${test})
+  castxml_test_output_cxx11(${test})
+  castxml_test_output_gnuxx11(${test})
+  castxml_test_output_cxx14(${test})
+  castxml_test_output_gnuxx14(${test})
 endmacro()
 
-macro(castxml_test_gccxml_broken test)
-  castxml_test_gccxml_broken_cxx98(${test})
-  castxml_test_gccxml_broken_gnuxx98(${test})
-  castxml_test_gccxml_broken_cxx11(${test})
-  castxml_test_gccxml_broken_gnuxx11(${test})
-  castxml_test_gccxml_broken_cxx14(${test})
-  castxml_test_gccxml_broken_gnuxx14(${test})
+macro(castxml_test_output_broken test)
+  castxml_test_output_broken_cxx98(${test})
+  castxml_test_output_broken_gnuxx98(${test})
+  castxml_test_output_broken_cxx11(${test})
+  castxml_test_output_broken_gnuxx11(${test})
+  castxml_test_output_broken_cxx14(${test})
+  castxml_test_output_broken_gnuxx14(${test})
 endmacro()
 
 set(input ${CMAKE_CURRENT_LIST_DIR}/input)
@@ -275,172 +275,172 @@ castxml_test_cmd(cc-msvc-c-src-c-cmd --castxml-cc-msvc-c $<TARGET_FILE:cc-msvc>
 castxml_test_cmd(cc-msvc-c-std-c89 --castxml-cc-msvc-c "(" $<TARGET_FILE:cc-msvc> ")" ${empty_c} "-###")
 unset(castxml_test_cmd_extra_arguments)
 
-castxml_test_gccxml(ArrayType)
-castxml_test_gccxml(ArrayType-incomplete)
-castxml_test_gccxml(Class)
-castxml_test_gccxml(Class-abstract)
-castxml_test_gccxml(Class-annotate)
-castxml_test_gccxml(Class-base-offset)
-castxml_test_gccxml(Class-base-typedef)
-castxml_test_gccxml(Class-bases)
-castxml_test_gccxml(Class-forward)
-castxml_test_gccxml(Class-friends)
-castxml_test_gccxml(Class-implicit-member-access)
-castxml_test_gccxml(Class-implicit-member-access-mutable)
-castxml_test_gccxml(Class-implicit-member-array)
-castxml_test_gccxml(Class-implicit-member-bad-base)
-castxml_test_gccxml(Class-implicit-member-const)
-castxml_test_gccxml(Class-implicit-member-const-aggregate)
-castxml_test_gccxml(Class-implicit-member-reference)
-castxml_test_gccxml(Class-implicit-members)
-castxml_test_gccxml(Class-incomplete)
-castxml_test_gccxml(Class-incomplete-twice)
-castxml_test_gccxml(Class-member-template)
-castxml_test_gccxml(Class-member-template-access)
-castxml_test_gccxml(Class-partial-template-member-Typedef)
-castxml_test_gccxml(Class-template)
-castxml_test_gccxml(Class-template-Method-Argument-const)
-castxml_test_gccxml(Class-template-Method-Argument-default)
-castxml_test_gccxml(Class-template-Method-return-const)
-castxml_test_gccxml(Class-template-bases)
-castxml_test_gccxml(Class-template-constructor-template)
-castxml_test_gccxml(Class-template-friends)
-castxml_test_gccxml(Class-template-member-nontemplate-Typedef)
-castxml_test_gccxml(Class-template-member-Typedef)
-castxml_test_gccxml(Class-template-member-Typedef-const)
-castxml_test_gccxml(Class-template-member-template)
-castxml_test_gccxml(Class-template-recurse)
-castxml_test_gccxml(Constructor)
-castxml_test_gccxml(Constructor-annotate)
-castxml_test_gccxml(Converter)
-castxml_test_gccxml(Converter-annotate)
-castxml_test_gccxml(CvQualifiedType)
-castxml_test_gccxml(CXXLiteral)
-castxml_test_gccxml(Destructor)
-castxml_test_gccxml(Destructor-annotate)
-castxml_test_gccxml(Enumeration)
-castxml_test_gccxml(Enumeration-annotate)
-castxml_test_gccxml(Enumeration-anonymous)
-castxml_test_gccxml(Field)
-castxml_test_gccxml(Field-annotate)
-castxml_test_gccxml(Function)
-castxml_test_gccxml(Function-annotate)
-castxml_test_gccxml(Function-Argument-annotate)
-castxml_test_gccxml(Function-Argument-decay)
-castxml_test_gccxml(Function-Argument-default)
-castxml_test_gccxml(Function-Argument-default-cast)
-castxml_test_gccxml(Function-Argument-default-ns)
-castxml_test_gccxml(Function-rvalue-reference)
-castxml_test_gccxml(Function-template)
-castxml_test_gccxml(Function-throw)
-castxml_test_gccxml(Function-variadic)
-castxml_test_gccxml(FunctionType)
-castxml_test_gccxml(FunctionType-variadic)
-castxml_test_gccxml(FundamentalType)
-castxml_test_gccxml(FundamentalTypes)
-castxml_test_gccxml(Method)
-castxml_test_gccxml(Method-annotate)
-castxml_test_gccxml(Method-Argument-default)
-castxml_test_gccxml(Method-Argument-default-cast)
-castxml_test_gccxml(Method-overrides)
-castxml_test_gccxml(Method-rvalue-reference)
-castxml_test_gccxml(MethodType)
-castxml_test_gccxml(MethodType-cv)
-castxml_test_gccxml(Namespace)
-castxml_test_gccxml(Namespace-anonymous)
-castxml_test_gccxml(Namespace-Class-members)
-castxml_test_gccxml(Namespace-Class-partial-template-members)
-castxml_test_gccxml(Namespace-Class-template-members)
-castxml_test_gccxml(Namespace-Function-template-members)
-castxml_test_gccxml(Namespace-empty)
-castxml_test_gccxml(Namespace-extern-C-members)
-castxml_test_gccxml(Namespace-inline)
-castxml_test_gccxml(Namespace-inline-start)
-castxml_test_gccxml(Namespace-inline-template)
-castxml_test_gccxml(Namespace-nested)
-castxml_test_gccxml(Namespace-repeat)
-castxml_test_gccxml(Namespace-repeat-start)
-castxml_test_gccxml(OffsetType)
-castxml_test_gccxml(OffsetType-cv)
-castxml_test_gccxml(OperatorFunction)
-castxml_test_gccxml(OperatorFunction-annotate)
-castxml_test_gccxml(OperatorMethod)
-castxml_test_gccxml(OperatorMethod-annotate)
-castxml_test_gccxml(PointerType)
-castxml_test_gccxml(ReferenceType)
-castxml_test_gccxml(RValueReferenceType)
-castxml_test_gccxml(TypeAlias)
-castxml_test_gccxml(TypeAliasTemplate)
-castxml_test_gccxml(Typedef-annotate)
-castxml_test_gccxml(Typedef-paren)
-castxml_test_gccxml(Typedef-to-Class-template)
-castxml_test_gccxml(Typedef-to-Enumeration)
-castxml_test_gccxml(Typedef-to-Enumeration-anonymous)
-castxml_test_gccxml(Typedef-to-FundamentalType-mode)
-castxml_test_gccxml(Typedef-to-extern-C-FundamentalType-mode)
-castxml_test_gccxml(Variable)
-castxml_test_gccxml(Variable-annotate)
-castxml_test_gccxml(Variable-in-Class)
-castxml_test_gccxml(Variable-init)
-castxml_test_gccxml(Variable-init-cast)
-castxml_test_gccxml(Variable-init-ns)
+castxml_test_output(ArrayType)
+castxml_test_output(ArrayType-incomplete)
+castxml_test_output(Class)
+castxml_test_output(Class-abstract)
+castxml_test_output(Class-annotate)
+castxml_test_output(Class-base-offset)
+castxml_test_output(Class-base-typedef)
+castxml_test_output(Class-bases)
+castxml_test_output(Class-forward)
+castxml_test_output(Class-friends)
+castxml_test_output(Class-implicit-member-access)
+castxml_test_output(Class-implicit-member-access-mutable)
+castxml_test_output(Class-implicit-member-array)
+castxml_test_output(Class-implicit-member-bad-base)
+castxml_test_output(Class-implicit-member-const)
+castxml_test_output(Class-implicit-member-const-aggregate)
+castxml_test_output(Class-implicit-member-reference)
+castxml_test_output(Class-implicit-members)
+castxml_test_output(Class-incomplete)
+castxml_test_output(Class-incomplete-twice)
+castxml_test_output(Class-member-template)
+castxml_test_output(Class-member-template-access)
+castxml_test_output(Class-partial-template-member-Typedef)
+castxml_test_output(Class-template)
+castxml_test_output(Class-template-Method-Argument-const)
+castxml_test_output(Class-template-Method-Argument-default)
+castxml_test_output(Class-template-Method-return-const)
+castxml_test_output(Class-template-bases)
+castxml_test_output(Class-template-constructor-template)
+castxml_test_output(Class-template-friends)
+castxml_test_output(Class-template-member-nontemplate-Typedef)
+castxml_test_output(Class-template-member-Typedef)
+castxml_test_output(Class-template-member-Typedef-const)
+castxml_test_output(Class-template-member-template)
+castxml_test_output(Class-template-recurse)
+castxml_test_output(Constructor)
+castxml_test_output(Constructor-annotate)
+castxml_test_output(Converter)
+castxml_test_output(Converter-annotate)
+castxml_test_output(CvQualifiedType)
+castxml_test_output(CXXLiteral)
+castxml_test_output(Destructor)
+castxml_test_output(Destructor-annotate)
+castxml_test_output(Enumeration)
+castxml_test_output(Enumeration-annotate)
+castxml_test_output(Enumeration-anonymous)
+castxml_test_output(Field)
+castxml_test_output(Field-annotate)
+castxml_test_output(Function)
+castxml_test_output(Function-annotate)
+castxml_test_output(Function-Argument-annotate)
+castxml_test_output(Function-Argument-decay)
+castxml_test_output(Function-Argument-default)
+castxml_test_output(Function-Argument-default-cast)
+castxml_test_output(Function-Argument-default-ns)
+castxml_test_output(Function-rvalue-reference)
+castxml_test_output(Function-template)
+castxml_test_output(Function-throw)
+castxml_test_output(Function-variadic)
+castxml_test_output(FunctionType)
+castxml_test_output(FunctionType-variadic)
+castxml_test_output(FundamentalType)
+castxml_test_output(FundamentalTypes)
+castxml_test_output(Method)
+castxml_test_output(Method-annotate)
+castxml_test_output(Method-Argument-default)
+castxml_test_output(Method-Argument-default-cast)
+castxml_test_output(Method-overrides)
+castxml_test_output(Method-rvalue-reference)
+castxml_test_output(MethodType)
+castxml_test_output(MethodType-cv)
+castxml_test_output(Namespace)
+castxml_test_output(Namespace-anonymous)
+castxml_test_output(Namespace-Class-members)
+castxml_test_output(Namespace-Class-partial-template-members)
+castxml_test_output(Namespace-Class-template-members)
+castxml_test_output(Namespace-Function-template-members)
+castxml_test_output(Namespace-empty)
+castxml_test_output(Namespace-extern-C-members)
+castxml_test_output(Namespace-inline)
+castxml_test_output(Namespace-inline-start)
+castxml_test_output(Namespace-inline-template)
+castxml_test_output(Namespace-nested)
+castxml_test_output(Namespace-repeat)
+castxml_test_output(Namespace-repeat-start)
+castxml_test_output(OffsetType)
+castxml_test_output(OffsetType-cv)
+castxml_test_output(OperatorFunction)
+castxml_test_output(OperatorFunction-annotate)
+castxml_test_output(OperatorMethod)
+castxml_test_output(OperatorMethod-annotate)
+castxml_test_output(PointerType)
+castxml_test_output(ReferenceType)
+castxml_test_output(RValueReferenceType)
+castxml_test_output(TypeAlias)
+castxml_test_output(TypeAliasTemplate)
+castxml_test_output(Typedef-annotate)
+castxml_test_output(Typedef-paren)
+castxml_test_output(Typedef-to-Class-template)
+castxml_test_output(Typedef-to-Enumeration)
+castxml_test_output(Typedef-to-Enumeration-anonymous)
+castxml_test_output(Typedef-to-FundamentalType-mode)
+castxml_test_output(Typedef-to-extern-C-FundamentalType-mode)
+castxml_test_output(Variable)
+castxml_test_output(Variable-annotate)
+castxml_test_output(Variable-in-Class)
+castxml_test_output(Variable-init)
+castxml_test_output(Variable-init-cast)
+castxml_test_output(Variable-init-ns)
 
 # Test multiple start declarations.
-set(castxml_test_gccxml_custom_input Namespace-nested)
-set(castxml_test_gccxml_custom_start --castxml-start start::ns1,start::ns3)
-castxml_test_gccxml(Namespace-nested-1)
-set(castxml_test_gccxml_custom_start --castxml-start start::ns1 --castxml-start start::ns3)
-castxml_test_gccxml(Namespace-nested-2)
-unset(castxml_test_gccxml_custom_start)
-unset(castxml_test_gccxml_custom_input)
-
-castxml_test_gccxml(invalid-decl-for-type)
-castxml_test_gccxml(qualified-type-name)
-castxml_test_gccxml(using-declaration-class)
-castxml_test_gccxml(using-declaration-ns)
-castxml_test_gccxml(using-declaration-start)
-castxml_test_gccxml(using-directive-ns)
-castxml_test_gccxml(using-directive-start)
-
-set(castxml_test_gccxml_custom_start "")
-castxml_test_gccxml(nostart)
-unset(castxml_test_gccxml_custom_start)
+set(castxml_test_output_custom_input Namespace-nested)
+set(castxml_test_output_custom_start --castxml-start start::ns1,start::ns3)
+castxml_test_output(Namespace-nested-1)
+set(castxml_test_output_custom_start --castxml-start start::ns1 --castxml-start start::ns3)
+castxml_test_output(Namespace-nested-2)
+unset(castxml_test_output_custom_start)
+unset(castxml_test_output_custom_input)
+
+castxml_test_output(invalid-decl-for-type)
+castxml_test_output(qualified-type-name)
+castxml_test_output(using-declaration-class)
+castxml_test_output(using-declaration-ns)
+castxml_test_output(using-declaration-start)
+castxml_test_output(using-directive-ns)
+castxml_test_output(using-directive-start)
+
+set(castxml_test_output_custom_start "")
+castxml_test_output(nostart)
+unset(castxml_test_output_custom_start)
 
 if(";${LLVM_TARGETS_TO_BUILD};" MATCHES ";X86;")
-  set(castxml_test_gccxml_extra_arguments -target i386-pc-windows-msvc)
-  castxml_test_gccxml(Function-calling-convention-ms)
-  castxml_test_gccxml(Function-calling-convention-ms-annotate)
-  castxml_test_gccxml(implicit-decl-ms)
-  castxml_test_gccxml(inline-asm-ms)
-  unset(castxml_test_gccxml_extra_arguments)
+  set(castxml_test_output_extra_arguments -target i386-pc-windows-msvc)
+  castxml_test_output(Function-calling-convention-ms)
+  castxml_test_output(Function-calling-convention-ms-annotate)
+  castxml_test_output(implicit-decl-ms)
+  castxml_test_output(inline-asm-ms)
+  unset(castxml_test_output_extra_arguments)
 endif()
 
-castxml_test_gccxml_c(FunctionNoProto)
-castxml_test_gccxml_c(FundamentalType)
-castxml_test_gccxml_c(Typedef-called-class)
+castxml_test_output_c(FunctionNoProto)
+castxml_test_output_c(FundamentalType)
+castxml_test_output_c(Typedef-called-class)
 
-castxml_test_gccxml_c(invalid)
+castxml_test_output_c(invalid)
 
-castxml_test_gccxml_broken(ReferenceType-to-Class-template)
+castxml_test_output_broken(ReferenceType-to-Class-template)
 
-set(castxml_test_gccxml_extra_arguments --castxml-cc-gnu-c "(" $<TARGET_FILE:cc-gnu> --cc-define=__x86_64__ ")")
-castxml_test_gccxml_c(GNU-float128)
-set(castxml_test_gccxml_custom_start "")
-castxml_test_gccxml_c(GNU-float128-nostart)
-unset(castxml_test_gccxml_custom_start)
-unset(castxml_test_gccxml_extra_arguments)
+set(castxml_test_output_extra_arguments --castxml-cc-gnu-c "(" $<TARGET_FILE:cc-gnu> --cc-define=__x86_64__ ")")
+castxml_test_output_c(GNU-float128)
+set(castxml_test_output_custom_start "")
+castxml_test_output_c(GNU-float128-nostart)
+unset(castxml_test_output_custom_start)
+unset(castxml_test_output_extra_arguments)
 
-set(castxml_test_gccxml_extra_arguments --castxml-cc-gnu "(" $<TARGET_FILE:cc-gnu> --cc-define=__x86_64__ ")")
-castxml_test_gccxml(GNU-float128)
-set(castxml_test_gccxml_custom_start "")
-castxml_test_gccxml(GNU-float128-nostart)
-unset(castxml_test_gccxml_custom_start)
-unset(castxml_test_gccxml_extra_arguments)
+set(castxml_test_output_extra_arguments --castxml-cc-gnu "(" $<TARGET_FILE:cc-gnu> --cc-define=__x86_64__ ")")
+castxml_test_output(GNU-float128)
+set(castxml_test_output_custom_start "")
+castxml_test_output(GNU-float128-nostart)
+unset(castxml_test_output_custom_start)
+unset(castxml_test_output_extra_arguments)
 
-set(castxml_test_gccxml_extra_arguments --castxml-cc-gnu-c $<TARGET_FILE:cc-gnu>)
-castxml_test_gccxml_c(GNU-va_arg_pack)
-unset(castxml_test_gccxml_extra_arguments)
+set(castxml_test_output_extra_arguments --castxml-cc-gnu-c $<TARGET_FILE:cc-gnu>)
+castxml_test_output_c(GNU-va_arg_pack)
+unset(castxml_test_output_extra_arguments)
 
-set(castxml_test_gccxml_extra_arguments --castxml-cc-gnu $<TARGET_FILE:cc-gnu>)
-castxml_test_gccxml(GNU-va_arg_pack)
-unset(castxml_test_gccxml_extra_arguments)
+set(castxml_test_output_extra_arguments --castxml-cc-gnu $<TARGET_FILE:cc-gnu>)
+castxml_test_output(GNU-va_arg_pack)
+unset(castxml_test_output_extra_arguments)