[cfe-commits] r67483 - in /cfe/trunk/test: Driver/bindings.c Driver/clang-translation.c Driver/hello.c Driver/parsing.c Driver/phases.c Driver/pth.c Frontend/stdin.c Lexer/dollar-idents.c

Eli Friedman eli.friedman at gmail.com
Sun Mar 22 14:49:20 PDT 2009 

Author: efriedma
Date: Sun Mar 22 16:49:20 2009
New Revision: 67483

URL: http://llvm.org/viewvc/llvm-project?rev=67483&view=rev
Log:
Don't use &> in tests; dash doesn't understand it.


Modified:
    cfe/trunk/test/Driver/bindings.c
    cfe/trunk/test/Driver/clang-translation.c
    cfe/trunk/test/Driver/hello.c
    cfe/trunk/test/Driver/parsing.c
    cfe/trunk/test/Driver/phases.c
    cfe/trunk/test/Driver/pth.c
    cfe/trunk/test/Frontend/stdin.c
    cfe/trunk/test/Lexer/dollar-idents.c

Modified: cfe/trunk/test/Driver/bindings.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/bindings.c?rev=67483&r1=67482&r2=67483&view=diff

==============================================================================
--- cfe/trunk/test/Driver/bindings.c (original)
+++ cfe/trunk/test/Driver/bindings.c Sun Mar 22 16:49:20 2009
@@ -1,47 +1,47 @@
 // Basic binding.
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings %s &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings %s 2> %t &&
 // RUN: grep 'bind - "clang", inputs: \[".*bindings.c"\], output: ".*\.s"' %t &&
 // RUN: grep 'bind - "gcc::Assemble", inputs: \[".*\.s"\], output: ".*\.o"' %t &&
 // RUN: grep 'bind - "gcc::Link", inputs: \[".*\.o"\], output: "a.out"' %t &&
 
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang %s &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang %s 2> %t &&
 // RUN: grep 'bind - "gcc::Compile", inputs: \[".*bindings.c"\], output: ".*\.s"' %t &&
 // RUN: grep 'bind - "gcc::Assemble", inputs: \[".*\.s"\], output: ".*\.o"' %t &&
 // RUN: grep 'bind - "gcc::Link", inputs: \[".*\.o"\], output: "a.out"' %t &&
 
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -no-integrated-cpp %s &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -no-integrated-cpp %s 2> %t &&
 // RUN: grep 'bind - "gcc::Preprocess", inputs: \[".*bindings.c"\], output: ".*\.i"' %t &&
 // RUN: grep 'bind - "gcc::Compile", inputs: \[".*\.i"\], output: ".*\.s"' %t &&
 // RUN: grep 'bind - "gcc::Assemble", inputs: \[".*\.s"\], output: ".*\.o"' %t &&
 // RUN: grep 'bind - "gcc::Link", inputs: \[".*\.o"\], output: "a.out"' %t &&
 
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -no-integrated-cpp -pipe %s &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -no-integrated-cpp -pipe %s 2> %t &&
 // RUN: grep 'bind - "gcc::Preprocess", inputs: \[".*bindings.c"\], output: (pipe)' %t &&
 // RUN: grep 'bind - "gcc::Compile", inputs: \[(pipe)\], output: (pipe)' %t &&
 // RUN: grep 'bind - "gcc::Assemble", inputs: \[(pipe)\], output: ".*\.o"' %t &&
 // RUN: grep 'bind - "gcc::Link", inputs: \[".*\.o"\], output: "a.out"' %t &&
 
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -x c-header %s &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -x c-header %s 2> %t &&
 // RUN: grep 'bind - "gcc::Precompile", inputs: \[".*bindings.c"\], output: ".*bindings.c.gch' %t &&
 
 // Clang control options
 
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -fsyntax-only %s &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -fsyntax-only %s 2> %t &&
 // RUN: grep 'bind - "clang", inputs: \[".*bindings.c"\], output: (nothing)' %t &&
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -fsyntax-only %s &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -fsyntax-only %s 2> %t &&
 // RUN: grep 'bind - "gcc::Compile", inputs: \[".*bindings.c"\], output: (nothing)' %t &&
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang-cxx -fsyntax-only -x c++ %s &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang-cxx -fsyntax-only -x c++ %s 2> %t &&
 // RUN: grep 'bind - "gcc::Compile", inputs: \[".*bindings.c"\], output: (nothing)' %t &&
-// RUN: clang-driver -ccc-print-bindings -ccc-no-clang-cpp -fsyntax-only -no-integrated-cpp -x c++ %s &> %t &&
+// RUN: clang-driver -ccc-print-bindings -ccc-no-clang-cpp -fsyntax-only -no-integrated-cpp -x c++ %s 2> %t &&
 // RUN: grep 'bind - "gcc::Preprocess", inputs: \[".*bindings.c"\], output: ".*\.ii"' %t &&
 // RUN: grep 'bind - "clang", inputs: \[".*\.ii"\], output: (nothing)' %t &&
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings -ccc-clang-archs i386 %s -S -arch ppc &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings -ccc-clang-archs i386 %s -S -arch ppc 2> %t &&
 // RUN: grep 'bind - "gcc::Compile", inputs: \[".*bindings.c"\], output: "bindings.s"' %t &&
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings -ccc-clang-archs ppc %s -S -arch ppc &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings -ccc-clang-archs ppc %s -S -arch ppc 2> %t &&
 // RUN: grep 'bind - "clang", inputs: \[".*bindings.c"\], output: "bindings.s"' %t &&
 
 // Darwin bindings
-// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings %s &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings %s 2> %t &&
 // RUN: grep 'bind - "clang", inputs: \[".*bindings.c"\], output: ".*\.s"' %t &&
 // RUN: grep 'bind - "darwin::Assemble", inputs: \[".*\.s"\], output: ".*\.o"' %t &&
 // RUN: grep 'bind - "gcc::Link", inputs: \[".*\.o"\], output: "a.out"' %t &&

Modified: cfe/trunk/test/Driver/clang-translation.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/clang-translation.c?rev=67483&r1=67482&r2=67483&view=diff

==============================================================================
--- cfe/trunk/test/Driver/clang-translation.c (original)
+++ cfe/trunk/test/Driver/clang-translation.c Sun Mar 22 16:49:20 2009
@@ -1,4 +1,4 @@
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -### -S -Os %s -o %t.s &> %t.log
+// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -### -S -Os %s -o %t.s 2> %t.log
 // RUN: grep '"-S"' %t.log &&
 // RUN: grep '"-disable-free"' %t.log &&
 // RUN: grep '"--relocation-model" "static"' %t.log &&

Modified: cfe/trunk/test/Driver/hello.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/hello.c?rev=67483&r1=67482&r2=67483&view=diff

==============================================================================
--- cfe/trunk/test/Driver/hello.c (original)
+++ cfe/trunk/test/Driver/hello.c Sun Mar 22 16:49:20 2009
@@ -1,4 +1,4 @@
-// RUN: clang-driver -ccc-echo -o %t %s &> %t.log &&
+// RUN: clang-driver -ccc-echo -o %t %s 2> %t.log &&
 
 // Make sure we used clang.
 // RUN: grep 'clang" .*hello.c' %t.log &&

Modified: cfe/trunk/test/Driver/parsing.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/parsing.c?rev=67483&r1=67482&r2=67483&view=diff

==============================================================================
--- cfe/trunk/test/Driver/parsing.c (original)
+++ cfe/trunk/test/Driver/parsing.c Sun Mar 22 16:49:20 2009
@@ -1,4 +1,4 @@
-// RUN: clang-driver -ccc-print-options input -Yunknown -m32 -arch ppc -djoined -A separate -Ajoined -Wp,one,two -Xarch_joined AndSeparate -sectalign 1 2 3 &> %t &&
+// RUN: clang-driver -ccc-print-options input -Yunknown -m32 -arch ppc -djoined -A separate -Ajoined -Wp,one,two -Xarch_joined AndSeparate -sectalign 1 2 3 2> %t &&
 // RUN: grep 'Option 0 - Name: "<input>", Values: {"input"}' %t &&
 // RUN: grep 'Option 1 - Name: "<unknown>", Values: {"-Yunknown"}' %t &&
 // RUN: grep 'Option 2 - Name: "-m32", Values: {}' %t &&

Modified: cfe/trunk/test/Driver/phases.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/phases.c?rev=67483&r1=67482&r2=67483&view=diff

==============================================================================
--- cfe/trunk/test/Driver/phases.c (original)
+++ cfe/trunk/test/Driver/phases.c Sun Mar 22 16:49:20 2009
@@ -1,5 +1,5 @@
 // Basic compilation for various types of files.
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-phases -x c %s -x objective-c %s -x c++ %s -x objective-c++ -x assembler %s -x assembler-with-cpp %s -x none %s &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-phases -x c %s -x objective-c %s -x c++ %s -x objective-c++ -x assembler %s -x assembler-with-cpp %s -x none %s 2> %t &&
 // RUN: grep '0: input, ".*phases.c", c' %t &&
 // RUN: grep -F '1: preprocessor, {0}, cpp-output' %t &&
 // RUN: grep -F '2: compiler, {1}, assembler' %t &&
@@ -24,7 +24,7 @@
 // RUN: grep -F '21: linker, {3, 7, 11, 13, 16, 20}, image' %t &&
 
 // Universal linked image.
-// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -x c %s -arch ppc -arch i386 &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -x c %s -arch ppc -arch i386 2> %t &&
 // RUN: grep '0: input, ".*phases.c", c' %t &&
 // RUN: grep -F '1: preprocessor, {0}, cpp-output' %t &&
 // RUN: grep -F '2: compiler, {1}, assembler' %t &&
@@ -35,7 +35,7 @@
 // RUN: grep -F '7: lipo, {5, 6}, image' %t &&
 
 // Universal object file.
-// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x c %s -arch ppc -arch i386 &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x c %s -arch ppc -arch i386 2> %t &&
 // RUN: grep '0: input, ".*phases.c", c' %t &&
 // RUN: grep -F '1: preprocessor, {0}, cpp-output' %t &&
 // RUN: grep -F '2: compiler, {1}, assembler' %t &&
@@ -45,33 +45,33 @@
 // RUN: grep -F '6: lipo, {4, 5}, object' %t &&
 
 // Arch defaulting
-// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x assembler %s &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x assembler %s 2> %t &&
 // RUN: grep -F '2: bind-arch, "i386", {1}, object' %t &&
-// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x assembler %s -m32 -m64 &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x assembler %s -m32 -m64 2> %t &&
 // RUN: grep -F '2: bind-arch, "x86_64", {1}, object' %t &&
-// RUN: clang-driver -ccc-host-triple x86_64-apple-darwin9 -ccc-print-phases -c -x assembler %s &> %t &&
+// RUN: clang-driver -ccc-host-triple x86_64-apple-darwin9 -ccc-print-phases -c -x assembler %s 2> %t &&
 // RUN: grep -F '2: bind-arch, "x86_64", {1}, object' %t &&
-// RUN: clang-driver -ccc-host-triple x86_64-apple-darwin9 -ccc-print-phases -c -x assembler %s -m64 -m32 &> %t &&
+// RUN: clang-driver -ccc-host-triple x86_64-apple-darwin9 -ccc-print-phases -c -x assembler %s -m64 -m32 2> %t &&
 // RUN: grep -F '2: bind-arch, "i386", {1}, object' %t &&
 
 // Analyzer
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-phases --analyze %s &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-phases --analyze %s 2> %t &&
 // RUN: grep '0: input, ".*phases.c", c' %t &&
 // RUN: grep -F '1: preprocessor, {0}, cpp-output' %t &&
 // RUN: grep -F '2: analyzer, {1}, plist' %t &&
 
 // Precompiler
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-phases -x c-header %s &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-phases -x c-header %s 2> %t &&
 // RUN: grep '0: input, ".*phases.c", c-header' %t &&
 // RUN: grep -F '1: preprocessor, {0}, c-header-cpp-output' %t &&
 // RUN: grep -F '2: precompiler, {1}, precompiled-header' %t &&
 
 // Darwin overrides the handling for .s
 // RUN: touch %t.s &&
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-phases -c %t.s &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-phases -c %t.s 2> %t &&
 // RUN: grep '0: input, ".*\.s", assembler' %t &&
 // RUN: grep -F '1: assembler, {0}, object' %t &&
-// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c %t.s &> %t &&
+// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c %t.s 2> %t &&
 // RUN: grep '0: input, ".*\.s", assembler-with-cpp' %t &&
 // RUN: grep -F '1: preprocessor, {0}, assembler' %t &&
 // RUN: grep -F '2: assembler, {1}, object' %t &&

Modified: cfe/trunk/test/Driver/pth.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/pth.c?rev=67483&r1=67482&r2=67483&view=diff

==============================================================================
--- cfe/trunk/test/Driver/pth.c (original)
+++ cfe/trunk/test/Driver/pth.c Sun Mar 22 16:49:20 2009
@@ -1,8 +1,8 @@
 // Test transparent PTH support.
 
-// RUN: clang-driver -x c-header %s -o %t.h.pch -### &> %t.log &&
+// RUN: clang-driver -x c-header %s -o %t.h.pch -### 2> %t.log &&
 // RUN: grep '".*/clang" .* "-o" ".*\.h\.pch" "-x" "c-header" ".*pth\.c"' %t.log &&
 
 // RUN: touch %t.h.pth &&
-// RUN: clang-driver -E -include %t.h %s -### &> %t.log &&
+// RUN: clang-driver -E -include %t.h %s -### 2> %t.log &&
 // RUN: grep '".*/clang" .*"-include-pth" ".*\.h\.pth" .*"-x" "c" ".*pth\.c"' %t.log

Modified: cfe/trunk/test/Frontend/stdin.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Frontend/stdin.c?rev=67483&r1=67482&r2=67483&view=diff

==============================================================================
--- cfe/trunk/test/Frontend/stdin.c (original)
+++ cfe/trunk/test/Frontend/stdin.c Sun Mar 22 16:49:20 2009
@@ -1,3 +1,3 @@
-// RUN: clang -E - < /dev/null &> %t
+// RUN: clang -E - < /dev/null > %t
 // RUN: grep '<built-in>' %t
  

Modified: cfe/trunk/test/Lexer/dollar-idents.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/dollar-idents.c?rev=67483&r1=67482&r2=67483&view=diff

==============================================================================
--- cfe/trunk/test/Lexer/dollar-idents.c (original)
+++ cfe/trunk/test/Lexer/dollar-idents.c Sun Mar 22 16:49:20 2009
@@ -1,6 +1,6 @@
-// RUN: clang -dump-tokens %s &> %t &&
+// RUN: clang -dump-tokens %s 2> %t &&
 // RUN: grep "identifier '\$A'" %t
-// RUN: clang -dump-tokens -x assembler-with-cpp %s &> %t &&
+// RUN: clang -dump-tokens -x assembler-with-cpp %s 2> %t &&
 // RUN: grep "identifier 'A'" %t
 // PR3808

More information about the cfe-commits mailing list