Do not use cat for tests

vgvassilev · Oct 23, 2020 · 9bbc9f8 · 9bbc9f8
1 parent e6dcc49
commit 9bbc9f8
Show file tree

Hide file tree

Showing 23 changed files with 23 additions and 25 deletions.
diff --git a/test/Autoloading/AutoForwarding.C b/test/Autoloading/AutoForwarding.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %cling -I%S -Xclang -verify
+// RUN: %cling -I%S -Xclang -verify < %s
 // XFAIL: vanilla-cling
 // Test FwdPrinterTest
 

diff --git a/test/CodeGeneration/Statics.C b/test/CodeGeneration/Statics.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %cling -Xclang -verify 2>&1 | FileCheck %s
+// RUN: %cling -Xclang -verify 2>&1 < %s | FileCheck %s
 
 #include <stdio.h>
 

diff --git a/test/CodeUnloading/AtExit.C b/test/CodeUnloading/AtExit.C
@@ -6,8 +6,8 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %cling -Xclang -verify 2>&1 | FileCheck %s
-// FIXME: %cat %s | %cling -fsyntax-only -Xclang -verify 2>&1
+// RUN: %cling -Xclang -verify 2>&1 < %s | FileCheck %s
+// FIXME: %cling -fsyntax-only -Xclang -verify 2>&1 < %s
 
 // Test to check functions registered via atexit are intercepted, and __dso_handle
 // is properly overridden in for child interpreters.

diff --git a/test/Interfaces/evaluate.C b/test/Interfaces/evaluate.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %cling -Xclang -verify | FileCheck %s
+// RUN: %cling -Xclang -verify < %s | FileCheck %s
 
 #include "cling/Interpreter/Interpreter.h"
 #include "cling/Interpreter/Value.h"

diff --git a/test/Interfaces/transactionReuse.C b/test/Interfaces/transactionReuse.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %built_cling -fno-rtti | FileCheck %s
+// RUN: %built_cling -fno-rtti < %s | FileCheck %s
 
 // This test makes sure the interpreter doesn't create many useless empty
 // transactions.

diff --git a/test/Lookup/data.C b/test/Lookup/data.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %built_cling -fno-rtti 2>&1 | FileCheck %s
+// RUN: %built_cling -fno-rtti 2>&1 < %s | FileCheck %s
 // Test lookupData
 
 .rawInput 1

diff --git a/test/Lookup/named.C b/test/Lookup/named.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %built_cling -fno-rtti 2>&1 | FileCheck %s
+// RUN: %built_cling -fno-rtti 2>&1 < %s | FileCheck %s
 // Test Lookup::Named and Namespace, used in quick simple lookups.
 
 #include "cling/Interpreter/Interpreter.h"

diff --git a/test/Lookup/scope.C b/test/Lookup/scope.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %built_cling -fno-rtti 2>&1 | FileCheck %s
+// RUN: %built_cling -fno-rtti 2>&1 < %s | FileCheck %s
 // Test findScope, which is essentially is a DeclContext.
 #include "cling/Interpreter/Interpreter.h"
 #include "cling/Interpreter/LookupHelper.h"

diff --git a/test/Lookup/tag.C b/test/Lookup/tag.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %built_cling -fno-rtti 2>&1 | FileCheck %s
+// RUN: %built_cling -fno-rtti 2>&1 < %s | FileCheck %s
 // Test Lookup::Named and Namespace, used in quick simple lookups.
 
 #include "cling/Interpreter/Interpreter.h"

diff --git a/test/Lookup/template.C b/test/Lookup/template.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %built_cling -fno-rtti 2>&1 | FileCheck %s
+// RUN: %built_cling -fno-rtti 2>&1 < %s | FileCheck %s
 // Test findClassTemplate, which is esentially is a DeclContext.
 #include "cling/Interpreter/Interpreter.h"
 #include "cling/Interpreter/LookupHelper.h"

diff --git a/test/NullDeref/BinOp.C b/test/NullDeref/BinOp.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %cling -Xclang -verify
+// RUN: %cling -Xclang -verify < %s
 // XFAIL: powerpc64
 //This file checks a pointer load operation for null prt dereference.
 int *p = 0;

diff --git a/test/NullDeref/Cast.C b/test/NullDeref/Cast.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %cling -Xclang -verify
+// RUN: %cling -Xclang -verify < %s
 // XFAIL: powerpc64
 //This file checks a pointer load operation for null prt dereference.
 int *p = 0;;

diff --git a/test/NullDeref/ExecutionTermination.C b/test/NullDeref/ExecutionTermination.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %cling -Xclang -verify
+// RUN: %cling -Xclang -verify < %s
 // XFAIL: powerpc64
 //This file checks that the execution ends after a null prt dereference.
 

diff --git a/test/NullDeref/InvalidMemoryAddress.C b/test/NullDeref/InvalidMemoryAddress.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %cling -Xclang -verify
+// RUN: %cling -Xclang -verify < %s
 // XFAIL: powerpc64
 //This file checks a dereference of an invalid memory address pointer..
 int *p = (int*)0x1;

diff --git a/test/NullDeref/Load.C b/test/NullDeref/Load.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %cling -Xclang -verify
+// RUN: %cling -Xclang -verify < %s
 // XFAIL: powerpc64
 //This file checks a pointer load operation for null prt dereference.
 int *p;

diff --git a/test/NullDeref/MethodCalls.C b/test/NullDeref/MethodCalls.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %cling -Xclang -verify
+// RUN: %cling -Xclang -verify < %s
 // XFAIL: powerpc64
 // This test verifies that we get nice warning if a method on null ptr object is
 // called.

diff --git a/test/NullDeref/NonNullArg.C b/test/NullDeref/NonNullArg.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %cling -Xclang -verify | FileCheck %s
+// RUN: %cling -Xclang -verify < %s | FileCheck %s
 // XFAIL: powerpc64
 //This file checks a call instruction. The called function has arguments with nonnull attribute.
 extern "C" int printf(const char* fmt, ...);

diff --git a/test/NullDeref/NonNullArgCustom.C b/test/NullDeref/NonNullArgCustom.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %cling -Xclang -verify
+// RUN: %cling -Xclang -verify < %s
 // XFAIL: powerpc64
 
 // We must be able to handle cases where, there is a custom function that has

diff --git a/test/Plugins/Simple.C b/test/Plugins/Simple.C
@@ -1,4 +1,4 @@
-// RUN: %cat %s | %cling -fplugin=%cling_obj_root/tools/plugins/example/libclingDemoPlugin%shlibext | FileCheck %s
+// RUN: %cling -fplugin=%cling_obj_root/tools/plugins/example/libclingDemoPlugin%shlibext < %s | FileCheck %s
 
 // CHECK:Action::ParseArgs
 // CHECK-NEXT:Action::CreateASTConsumer

diff --git a/test/Prompt/ValuePrinter/Regression.C b/test/Prompt/ValuePrinter/Regression.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %cling 2>&1 | FileCheck %s
+// RUN: %cling 2>&1 < %s | FileCheck %s
 
 // This file should be used as regression test for the value printing subsystem
 // Reproducers of fixed bugs should be put here

diff --git a/test/Prompt/ValuePrinter/Strings.C b/test/Prompt/ValuePrinter/Strings.C
@@ -7,7 +7,7 @@
 //------------------------------------------------------------------------------
 
 // Windows wants -Wno-deprecated-declarations
-//RUN: %cat %s | %cling -Wno-deprecated-declarations -Xclang -verify 2>&1 | FileCheck %s
+//RUN: %cling -Wno-deprecated-declarations -Xclang -verify 2>&1 < %s | FileCheck %s
 
 #include <stdlib.h>
 #ifdef _WIN32

diff --git a/test/Utils/Transform.C b/test/Utils/Transform.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: %cat %s | %built_cling -fno-rtti | FileCheck %s
+// RUN: %built_cling -fno-rtti < %s | FileCheck %s
 
 // The test verifies the expected behavior in cling::utils::Transform class,
 // which is supposed to provide different transformation of AST nodes and types.

diff --git a/test/lit.cfg b/test/lit.cfg
@@ -286,11 +286,9 @@ else:
 if platform.system() in ['Windows']:
   config.substitutions.append(('%dllexport', '"__declspec(dllexport)"'))
   config.substitutions.append(('%fPIC', ''))
-  config.substitutions.append(('%cat', 'type'))
 else:
   config.substitutions.append(('%dllexport', ''))
   config.substitutions.append(('%fPIC', '-fPIC'))
-  config.substitutions.append(('%cat', 'cat'))
 
 if IsWindows and execute_external:
   config.substitutions.append(('%mkdir', 'mkdir'))