From 76f23228cf96f3ec31aee7bdf3713a8b0b43a8ce Mon Sep 17 00:00:00 2001 From: Jonas Hahnfeld Date: Mon, 14 Aug 2023 15:06:16 +0200 Subject: [PATCH 1/2] [cling] Stop using triple substrings in UNSUPPORTED With LLVM 16 and https://reviews.llvm.org/D141007, this will not be supported anymore. As a replacement, use system-{darwin,linux,windows}. --- .../cling/test/DynamicLibraryManager/callable_lib_L_AB_subst.C | 2 +- .../cling/test/DynamicLibraryManager/callable_lib_L_AB_subst1.C | 2 +- .../cling/test/DynamicLibraryManager/callable_lib_L_AB_subst2.C | 2 +- .../cling/test/DynamicLibraryManager/callable_lib_L_AB_subst3.C | 2 +- .../cling/test/DynamicLibraryManager/callable_lib_L_AB_subst4.C | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst.C b/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst.C index 0cd6aeb587cf4..7821e85062081 100644 --- a/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst.C +++ b/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst.C @@ -6,7 +6,7 @@ // LICENSE.TXT for details. //------------------------------------------------------------------------------ -// UNSUPPORTED: macos +// UNSUPPORTED: system-darwin // RUN: mkdir -p %t-dir/rlib // RUN: mkdir -p %t-dir/lib // RUN: %clang -shared -DCLING_EXPORT=%dllexport %S/call_lib_A.c -o%t-dir/rlib/libcall_lib_A%shlibext diff --git a/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst1.C b/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst1.C index b0250874dd3e0..598571193570c 100644 --- a/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst1.C +++ b/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst1.C @@ -6,7 +6,7 @@ // LICENSE.TXT for details. //------------------------------------------------------------------------------ -// UNSUPPORTED: windows, linux +// UNSUPPORTED: system-windows, system-linux // RUN: mkdir -p %t-dir/rlib // RUN: mkdir -p %t-dir/lib // RUN: %clang -shared -DCLING_EXPORT=%dllexport %S/call_lib_A.c -o%t-dir/rlib/libcall_lib_A%shlibext diff --git a/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst2.C b/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst2.C index f305cc7f3a5b7..641c4eda19be8 100644 --- a/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst2.C +++ b/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst2.C @@ -6,7 +6,7 @@ // LICENSE.TXT for details. //------------------------------------------------------------------------------ -// UNSUPPORTED: windows, linux +// UNSUPPORTED: system-windows, system-linux // RUN: mkdir -p %t-dir/rlib // RUN: mkdir -p %t-dir/lib // RUN: %clang -shared -DCLING_EXPORT=%dllexport %S/call_lib_A.c -o%t-dir/rlib/libcall_lib_A%shlibext diff --git a/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst3.C b/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst3.C index 8e446a95e5777..20b73a61044ed 100644 --- a/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst3.C +++ b/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst3.C @@ -6,7 +6,7 @@ // LICENSE.TXT for details. //------------------------------------------------------------------------------ -// UNSUPPORTED: windows +// UNSUPPORTED: system-windows // RUN: mkdir -p %t-dir/rlib // RUN: mkdir -p %t-dir/lib // RUN: %clang -shared -DCLING_EXPORT=%dllexport %S/call_lib_A.c -o%t-dir/rlib/libcall_lib_A%shlibext diff --git a/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst4.C b/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst4.C index adc51c14d54ce..5a7d6a4c00b7c 100644 --- a/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst4.C +++ b/interpreter/cling/test/DynamicLibraryManager/callable_lib_L_AB_subst4.C @@ -6,7 +6,7 @@ // LICENSE.TXT for details. //------------------------------------------------------------------------------ -// UNSUPPORTED: windows +// UNSUPPORTED: system-windows // RUN: mkdir -p %t-dir/rlib // RUN: mkdir -p %t-dir/lib // RUN: %clang -shared -DCLING_EXPORT=%dllexport %S/call_lib_A.c -o%t-dir/rlib/libcall_lib_A%shlibext From 521ba598acdf0cbbdea65ff3e7ef45076703e3b7 Mon Sep 17 00:00:00 2001 From: Jonas Hahnfeld Date: Mon, 14 Aug 2023 15:08:35 +0200 Subject: [PATCH 2/2] [cling] Remove REQUIRES: not_system-windows Replace it by the standard UNSUPPORTED: system-windows. --- interpreter/cling/test/Driver/CommandHistory.C | 2 +- interpreter/cling/test/Driver/CurrentDirRm.C | 2 +- interpreter/cling/test/Driver/Gnu.C | 2 +- interpreter/cling/test/Driver/StartupFile.C | 2 +- .../cling/test/DynamicLibraryManager/cached_realpath.C | 2 +- interpreter/cling/test/DynamicLibraryManager/pie.C | 2 +- interpreter/cling/test/lit.cfg | 4 ---- 7 files changed, 6 insertions(+), 10 deletions(-) diff --git a/interpreter/cling/test/Driver/CommandHistory.C b/interpreter/cling/test/Driver/CommandHistory.C index d91e54ee88069..aefda3ce02a41 100644 --- a/interpreter/cling/test/Driver/CommandHistory.C +++ b/interpreter/cling/test/Driver/CommandHistory.C @@ -10,7 +10,7 @@ // RUN: %rm /tmp/__testing_cling_history // RUN: cat %s | env --unset=CLING_NOHISTORY CLING_HISTSIZE=8 CLING_HISTFILE="/tmp/__testing_cling_history" %cling - 2>&1 // RUN: diff /tmp/__testing_cling_history "%S/Inputs/cling_history" -// REQUIRES: not_system-windows +// UNSUPPORTED: system-windows #include diff --git a/interpreter/cling/test/Driver/CurrentDirRm.C b/interpreter/cling/test/Driver/CurrentDirRm.C index f66aed006702a..d8ab6779d8ac1 100644 --- a/interpreter/cling/test/Driver/CurrentDirRm.C +++ b/interpreter/cling/test/Driver/CurrentDirRm.C @@ -11,7 +11,7 @@ // RUN: cd "%T/Remove" // RUN: %rmdir "%T/Remove" // RUN: %cling %s -Xclang -verify 2>&1 | FileCheck %s -// REQUIRES: not_system-windows +// UNSUPPORTED: system-windows extern "C" { int printf(const char*, ...); diff --git a/interpreter/cling/test/Driver/Gnu.C b/interpreter/cling/test/Driver/Gnu.C index 47c0c084a2155..28ff19a15c15f 100644 --- a/interpreter/cling/test/Driver/Gnu.C +++ b/interpreter/cling/test/Driver/Gnu.C @@ -10,7 +10,7 @@ // RUN: cat %s | %cling -D__STRICT_ANSI__ -std=gnu++11 -Xclang -verify 2>&1 | FileCheck %s // RUN: cat %s | %cling -D__STRICT_ANSI__ -std=gnu++14 -Xclang -verify 2>&1 | FileCheck %s // RUN: cat %s | %cling -D__STRICT_ANSI__ -std=gnu++1z -Xclang -verify 2>&1 | FileCheck %s -// REQUIRES: not_system-windows +// UNSUPPORTED: system-windows #ifdef __cplusplus extern "C" int printf(const char*, ...); diff --git a/interpreter/cling/test/Driver/StartupFile.C b/interpreter/cling/test/Driver/StartupFile.C index 4b0e304587d3d..04479a2d8ebe0 100644 --- a/interpreter/cling/test/Driver/StartupFile.C +++ b/interpreter/cling/test/Driver/StartupFile.C @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ // RUN: cat %s | env CLING_HOME="%S/Inputs" %cling %s 2>&1 | FileCheck %s -// REQUIRES: not_system-windows +// UNSUPPORTED: system-windows // CHECK: Startup file ran, magic # was 43210 diff --git a/interpreter/cling/test/DynamicLibraryManager/cached_realpath.C b/interpreter/cling/test/DynamicLibraryManager/cached_realpath.C index 7193d67a2e8d6..c4a6dbff8afd1 100644 --- a/interpreter/cling/test/DynamicLibraryManager/cached_realpath.C +++ b/interpreter/cling/test/DynamicLibraryManager/cached_realpath.C @@ -6,7 +6,7 @@ // LICENSE.TXT for details. //------------------------------------------------------------------------------ -// REQUIRES: not_system-windows +// UNSUPPORTED: system-windows // RUN: %rm -fr %t-dir // RUN: %mkdir %t-dir diff --git a/interpreter/cling/test/DynamicLibraryManager/pie.C b/interpreter/cling/test/DynamicLibraryManager/pie.C index 92aac5e34ac85..b1b6e3f330593 100644 --- a/interpreter/cling/test/DynamicLibraryManager/pie.C +++ b/interpreter/cling/test/DynamicLibraryManager/pie.C @@ -6,7 +6,7 @@ // LICENSE.TXT for details. //------------------------------------------------------------------------------ -// REQUIRES: not_system-windows +// UNSUPPORTED: system-windows // RUN: mkdir -p %t-dir/lib // RUN: %clang -shared -DCLING_EXPORT=%dllexport %S/call_lib_A.c -o%t-dir/lib/libcall_lib_A%shlibext diff --git a/interpreter/cling/test/lit.cfg b/interpreter/cling/test/lit.cfg index 8c5afbd0a01f7..d1b480bc27a0a 100644 --- a/interpreter/cling/test/lit.cfg +++ b/interpreter/cling/test/lit.cfg @@ -109,10 +109,6 @@ config.substitutions.append(('%shlibext', config.shlibext)) if platform.system() not in ['Windows'] or lit_config.getBashPath() != '': config.available_features.add('shell') -# Filter-out tests not supposed to run on Windows -if platform.system() not in ['Windows']: - config.available_features.add('not_system-windows') - # ROOT adds features that "heal" some of cling's tests; need to detect # vanilla vs cling-as-part-of-ROOT. The latter has no `lib/UserInterface/textinput/`: if os.path.isdir(os.path.join(config.cling_src_root, 'lib', 'UserInterface', 'textinput')):