Automatically adjust C++ version of PCH in Cling's test

This fixes test/CodeUnloading/PCH/VTables.C with C++17 and later.
root-project · Jul 20, 2023 · c157468 · c157468
1 parent a9ebc38
commit c157468
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/test/CodeUnloading/PCH/VTables.C b/test/CodeUnloading/PCH/VTables.C
@@ -1,7 +1,7 @@
 // RUN: %mkdir "%T/Rel/Path" || true
 // RUN: %rm "CompGen.h.pch" && %rm "%T/Rel/Path/Relative.pch"
-// RUN: clang -x c++-header -fexceptions -fcxx-exceptions -std=c++14 -pthread %S/Inputs/CompGen.h -o CompGen.h.pch
-// RUN: clang -x c++-header -fexceptions -fcxx-exceptions -std=c++14 -pthread %S/Inputs/CompGen.h -o %T/Rel/Path/Relative.pch
+// RUN: clang -x c++-header -fexceptions -fcxx-exceptions -std=%std_cxx -pthread %S/Inputs/CompGen.h -o CompGen.h.pch
+// RUN: clang -x c++-header -fexceptions -fcxx-exceptions -std=%std_cxx -pthread %S/Inputs/CompGen.h -o %T/Rel/Path/Relative.pch
 // RUN: cat %s | %cling -I%p -Xclang -include-pch -Xclang CompGen.h.pch  2>&1 | FileCheck %s
 // RUN: cat %s | %cling -I%p -I%T/Rel/Path -include-pch Relative.pch 2>&1 | FileCheck %s
 

diff --git a/test/lit.cfg b/test/lit.cfg
@@ -76,6 +76,8 @@ config.substitutions.append(('%cling_obj_root', config.cling_obj_root))
 incDir = os.path.join(config.llvm_obj_root, 'tools', 'clang', 'include')
 config.substitutions.append( ('%cling', config.llvm_tools_dir + '/cling --nologo -I%s' % fixupPath(incDir)) )
 
+config.substitutions.append(('%std_cxx', 'c++' + config.cxx_standard))
+
 if platform.system() in ['Windows']:
   config.substitutions.append(('%dllexport', '"__declspec(dllexport)"'))
   config.substitutions.append(('%fPIC', ''))

diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
@@ -8,6 +8,7 @@ config.cling_obj_root = "@CLING_BINARY_DIR@"
 config.target_triple = "@TARGET_TRIPLE@"
 config.host_triple = "@TARGET_TRIPLE@"
 config.shlibext = "@TARGET_SHLIBEXT@"
+config.cxx_standard = "@CMAKE_CXX_STANDARD@"
 
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.