Skip to content

Commit b2af2a8

Browse files
devajithvsdevajithvs
committed
[cling][test][lit] Remove deprecated %T
Ref: llvm/llvm-project@db8dad2 llvm/llvm-project@7ff6973
1 parent cecf860 commit b2af2a8

8 files changed

Lines changed: 35 additions & 27 deletions

File tree

‎interpreter/cling/test/CodeGeneration/Symbols.C‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
// LICENSE.TXT for details.
77
//------------------------------------------------------------------------------
88

9-
// RUN: clang -shared %fPIC -DCLING_EXPORT=%dllexport -DBUILD_SHARED %s -o%T/libSymbols%shlibext
10-
// RUN: %cling --nologo -L%T -lSymbols %s | FileCheck %s
9+
// RUN: rm -rf %t.dir && mkdir -p %t.dir
10+
// RUN: clang -shared %fPIC -DCLING_EXPORT=%dllexport -DBUILD_SHARED %s -o%t.dir/libSymbols%shlibext
11+
// RUN: %cling --nologo -L%t.dir -lSymbols %s | FileCheck %s
1112

1213
// Check that weak symbols do not get re-emitted (ROOT-6124)
1314
extern "C" int printf(const char*,...);

‎interpreter/cling/test/CodeUnloading/PCH/VTables.C‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// RUN: %mkdir "%T/Rel/Path" || true
2-
// RUN: %rm "CompGen.h.pch" && %rm "%T/Rel/Path/Relative.pch"
1+
// RUN: rm -rf %t.dir && mkdir -p %t.dir
2+
// RUN: %mkdir "%t.dir/Rel/Path" || true
3+
// RUN: %rm "CompGen.h.pch" && %rm "%t.dir/Rel/Path/Relative.pch"
34
// RUN: clang -x c++-header -fexceptions -fcxx-exceptions -std=%std_cxx -pthread %S/Inputs/CompGen.h -o CompGen.h.pch
4-
// RUN: clang -x c++-header -fexceptions -fcxx-exceptions -std=%std_cxx -pthread %S/Inputs/CompGen.h -o %T/Rel/Path/Relative.pch
5+
// RUN: clang -x c++-header -fexceptions -fcxx-exceptions -std=%std_cxx -pthread %S/Inputs/CompGen.h -o %t.dir/Rel/Path/Relative.pch
56
// RUN: cat %s | %cling -I%p -Xclang -include-pch -Xclang CompGen.h.pch 2>&1 | FileCheck %s
6-
// RUN: cat %s | %cling -I%p -I%T/Rel/Path -include-pch Relative.pch 2>&1 | FileCheck %s
7+
// RUN: cat %s | %cling -I%p -I%t.dir/Rel/Path -include-pch Relative.pch 2>&1 | FileCheck %s
78

89
//.storeState "a"
910
.x TriggerCompGen.h

‎interpreter/cling/test/Driver/CurrentDirRm.C‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
//------------------------------------------------------------------------------
88

99
// Removing the cwd on Unix works but on Windows cannot be done.
10-
// RUN: %mkdir "%T/Remove"
11-
// RUN: cd "%T/Remove"
12-
// RUN: %rmdir "%T/Remove"
10+
// RUN: rm -rf %t.dir && mkdir -p %t.dir
11+
// RUN: %mkdir "%t.dir/Remove"
12+
// RUN: cd "%t.dir/Remove"
13+
// RUN: %rmdir "%t.dir/Remove"
1314
// RUN: %cling %s -Xclang -verify 2>&1 | FileCheck %s
1415
// UNSUPPORTED: system-windows
1516

‎interpreter/cling/test/LibraryCall/call.C‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
// LICENSE.TXT for details.
77
//------------------------------------------------------------------------------
88

9-
// RUN: clang -shared -DCLING_EXPORT=%dllexport %S/call_lib.c -o%T/libcall_lib2%shlibext
10-
// RUN: cat %s | %cling -L%T | FileCheck %s
9+
// RUN: rm -rf %t.dir && mkdir -p %t.dir
10+
// RUN: clang -shared -DCLING_EXPORT=%dllexport %S/call_lib.c -o%t.dir/libcall_lib2%shlibext
11+
// RUN: cat %s | %cling -L%t.dir | FileCheck %s
1112

1213
.L libcall_lib2
1314
extern "C" int cling_testlibrary_function();

‎interpreter/cling/test/LibraryCall/callable_lib.C‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
// LICENSE.TXT for details.
77
//------------------------------------------------------------------------------
88

9-
// RUN: clang -shared -DCLING_EXPORT=%dllexport %S/call_lib.c -o%T/libcall_lib%shlibext
10-
// RUN: cat %s | %cling -L%T | FileCheck %s
9+
// RUN: rm -rf %t.dir && mkdir -p %t.dir
10+
// RUN: clang -shared -DCLING_EXPORT=%dllexport %S/call_lib.c -o%t.dir/libcall_lib%shlibext
11+
// RUN: cat %s | %cling -L%t.dir | FileCheck %s
1112

1213
.L libcall_lib
1314
extern "C" int cling_testlibrary_function();

‎interpreter/cling/test/Pragmas/add_env_path.C‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
// LICENSE.TXT for details.
77
//------------------------------------------------------------------------------
88

9-
// RUN: %mkdir "%T/subdir" || true
10-
// RUN: %rm "%T/subdir/libtest%shlibext"
11-
// RUN: clang -DCLING_EXPORT=%dllexport -shared %S/call_lib.c -o %T/subdir/libtest%shlibext
12-
// RUN: cat %s | %cling -I %S -DENVVAR_LIB="\"%/T/subdir\"" -DENVVAR_INC="\"%/p/subdir\"" -Xclang -verify 2>&1 | FileCheck %s
9+
// RUN: rm -rf %t.dir && mkdir -p %t.dir
10+
// RUN: %mkdir "%t.dir/subdir" || true
11+
// RUN: %rm "%t.dir/subdir/libtest%shlibext"
12+
// RUN: clang -DCLING_EXPORT=%dllexport -shared %S/call_lib.c -o %t.dir/subdir/libtest%shlibext
13+
// RUN: cat %s | %cling -I %S -DENVVAR_LIB="\"%/t.dir/subdir\"" -DENVVAR_INC="\"%/p/subdir\"" -Xclang -verify 2>&1 | FileCheck %s
1314

1415
extern "C" int cling_testlibrary_function();
1516

‎interpreter/cling/test/Pragmas/load.C‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
// LICENSE.TXT for details.
77
//------------------------------------------------------------------------------
88

9-
// RUN: clang -shared -DCLING_EXPORT=%dllexport %S/call_lib.c -o%T/libcall_lib%shlibext
10-
// RUN: cat %s | %cling -L %T -Xclang -verify 2>&1 | FileCheck %s
9+
// RUN: rm -rf %t.dir && mkdir -p %t.dir
10+
// RUN: clang -shared -DCLING_EXPORT=%dllexport %S/call_lib.c -o%t.dir/libcall_lib%shlibext
11+
// RUN: cat %s | %cling -L %t.dir -Xclang -verify 2>&1 | FileCheck %s
1112

1213
#pragma cling load("DoesNotExistPleaseRecover")
1314
// expected-error@input_line_12:1{{'DoesNotExistPleaseRecover' file not found}}

‎interpreter/cling/test/Prompt/OutputRedirect.C‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
// RUN: cat %s | %cling -DCLING_TMP="\"%/T\"" | FileCheck --check-prefix=CHECKOUT %s
2-
// RUN: cat %T/outfile.txt | FileCheck --check-prefix=CHECK-REDIRECTOUT %s
3-
// RUN: cat %T/errfile.txt | FileCheck --check-prefix=CHECK-REDIRECTERR %s
4-
// RUN: cat %T/bothfile.txt | FileCheck --check-prefix=CHECK-REDIRECTBOTH %s
5-
// RUN: cat %T/anotheroutfile.txt | FileCheck --check-prefix=CHECK-REDIRECTANOTHER %s
6-
// RUN: cat %T/nospace.txt | FileCheck --check-prefix=CHECK-NOSPACE %s
7-
// RUN: cat %s | %cling -DCLING_TMP="\"%/T\"" 2> %T/stderr.txt && cat %T/stderr.txt | FileCheck --check-prefix=CHECKERR %s
8-
// RUN: cat %s | %cling -DCLING_TMP="\"%/T\"" 2>&1 | FileCheck --check-prefix=CHECKERR --check-prefix=CHECKOUT %s
1+
// RUN: rm -rf %t.dir && mkdir -p %t.dir
2+
// RUN: cat %s | %cling -DCLING_TMP="\"%/t.dir\"" | FileCheck --check-prefix=CHECKOUT %s
3+
// RUN: cat %t.dir/outfile.txt | FileCheck --check-prefix=CHECK-REDIRECTOUT %s
4+
// RUN: cat %t.dir/errfile.txt | FileCheck --check-prefix=CHECK-REDIRECTERR %s
5+
// RUN: cat %t.dir/bothfile.txt | FileCheck --check-prefix=CHECK-REDIRECTBOTH %s
6+
// RUN: cat %t.dir/anotheroutfile.txt | FileCheck --check-prefix=CHECK-REDIRECTANOTHER %s
7+
// RUN: cat %t.dir/nospace.txt | FileCheck --check-prefix=CHECK-NOSPACE %s
8+
// RUN: cat %s | %cling -DCLING_TMP="\"%/t.dir\"" 2> %t.dir/stderr.txt && cat %t.dir/stderr.txt | FileCheck --check-prefix=CHECKERR %s
9+
// RUN: cat %s | %cling -DCLING_TMP="\"%/t.dir\"" 2>&1 | FileCheck --check-prefix=CHECKERR --check-prefix=CHECKOUT %s
910

1011
#include <iostream>
1112

0 commit comments

Comments
 (0)