From 4177e6fff50552908bab510f1e896fa974a6f155 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Mon, 2 Jul 2012 12:47:22 +0000 Subject: Convert all tests using TCL-style quoting to use shell-style quoting. This was done through the aid of a terrible Perl creation. I will not paste any of the horrors here. Suffice to say, it require multiple staged rounds of replacements, state carried between, and a few nested-construct-parsing hacks that I'm not proud of. It happens, by luck, to be able to deal with all the TCL-quoting patterns in evidence in the LLVM test suite. If anyone is maintaining large out-of-tree test trees, feel free to poke me and I'll send you the steps I used to convert things, as well as answer any painful questions etc. IRC works best for this type of thing I find. Once converted, switch the LLVM lit config to use ShTests the same as Clang. In addition to being able to delete large amounts of Python code from 'lit', this will also simplify the entire test suite and some of lit's architecture. Finally, the test suite runs 33% faster on Linux now. ;] For my 16-hardware-thread (2x 4-core xeon e5520): 36s -> 24s git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159525 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/TableGen/DefmInherit.td | 2 +- test/TableGen/LazyChange.td | 2 +- test/TableGen/ListOfList.td | 2 +- test/TableGen/MultiClass.td | 2 +- test/TableGen/MultiClassInherit.td | 2 +- test/TableGen/Slice.td | 4 ++-- test/TableGen/TargetInstrSpec.td | 4 ++-- test/TableGen/cast.td | 2 +- test/TableGen/foreach.td | 6 +++--- test/TableGen/lisp.td | 2 +- test/TableGen/subst.td | 12 ++++++------ 11 files changed, 20 insertions(+), 20 deletions(-) (limited to 'test/TableGen') diff --git a/test/TableGen/DefmInherit.td b/test/TableGen/DefmInherit.td index 47fd81d..46d3f62 100644 --- a/test/TableGen/DefmInherit.td +++ b/test/TableGen/DefmInherit.td @@ -1,4 +1,4 @@ -// RUN: llvm-tblgen %s | grep {zing = 4} | count 4 +// RUN: llvm-tblgen %s | grep "zing = 4" | count 4 // XFAIL: vg_leak class C1 { diff --git a/test/TableGen/LazyChange.td b/test/TableGen/LazyChange.td index 8145a3f..306959e 100644 --- a/test/TableGen/LazyChange.td +++ b/test/TableGen/LazyChange.td @@ -1,4 +1,4 @@ -// RUN: llvm-tblgen %s | grep {int Y = 3} +// RUN: llvm-tblgen %s | grep "int Y = 3" // XFAIL: vg_leak class C { diff --git a/test/TableGen/ListOfList.td b/test/TableGen/ListOfList.td index 565a99c..864401e 100644 --- a/test/TableGen/ListOfList.td +++ b/test/TableGen/ListOfList.td @@ -1,6 +1,6 @@ // RUN llvm-tblgen %s | FileCheck %s -// RUN: llvm-tblgen %s | grep {foo} | count 1 +// RUN: llvm-tblgen %s | grep "foo" | count 1 // XFAIL: vg_leak class Base { diff --git a/test/TableGen/MultiClass.td b/test/TableGen/MultiClass.td index 04f3a56..449c5d6 100644 --- a/test/TableGen/MultiClass.td +++ b/test/TableGen/MultiClass.td @@ -1,4 +1,4 @@ -// RUN: llvm-tblgen %s | grep {zing = 4} | count 2 +// RUN: llvm-tblgen %s | grep "zing = 4" | count 2 // XFAIL: vg_leak class C1 { diff --git a/test/TableGen/MultiClassInherit.td b/test/TableGen/MultiClassInherit.td index 8b78bc7..c768fff 100644 --- a/test/TableGen/MultiClassInherit.td +++ b/test/TableGen/MultiClassInherit.td @@ -1,4 +1,4 @@ -// RUN: llvm-tblgen %s | grep {zing = 4} | count 28 +// RUN: llvm-tblgen %s | grep "zing = 4" | count 28 // XFAIL: vg_leak class C1 { diff --git a/test/TableGen/Slice.td b/test/TableGen/Slice.td index 2d2822c..6d051d7 100644 --- a/test/TableGen/Slice.td +++ b/test/TableGen/Slice.td @@ -1,5 +1,5 @@ -// RUN: llvm-tblgen %s | grep {\\\[(set} | count 2 -// RUN: llvm-tblgen %s | grep {\\\[\\\]} | count 2 +// RUN: llvm-tblgen %s | grep "\[(set" | count 2 +// RUN: llvm-tblgen %s | grep "\[\]" | count 2 // XFAIL: vg_leak class ValueType { diff --git a/test/TableGen/TargetInstrSpec.td b/test/TableGen/TargetInstrSpec.td index 7b611e7..64b706d 100644 --- a/test/TableGen/TargetInstrSpec.td +++ b/test/TableGen/TargetInstrSpec.td @@ -1,5 +1,5 @@ -// RUN: llvm-tblgen %s | grep {\\\[(set VR128:\$dst, (int_x86_sse2_add_pd VR128:\$src1, VR128:\$src2))\\\]} | count 1 -// RUN: llvm-tblgen %s | grep {\\\[(set VR128:\$dst, (int_x86_sse2_add_ps VR128:\$src1, VR128:\$src2))\\\]} | count 1 +// RUN: llvm-tblgen %s | grep '\[(set VR128:$dst, (int_x86_sse2_add_pd VR128:$src1, VR128:$src2))\]' | count 1 +// RUN: llvm-tblgen %s | grep '\[(set VR128:$dst, (int_x86_sse2_add_ps VR128:$src1, VR128:$src2))\]' | count 1 // XFAIL: vg_leak class ValueType { diff --git a/test/TableGen/cast.td b/test/TableGen/cast.td index 8a23eb4..7948aff 100644 --- a/test/TableGen/cast.td +++ b/test/TableGen/cast.td @@ -1,4 +1,4 @@ -// RUN: llvm-tblgen %s | grep {add_ps} | count 3 +// RUN: llvm-tblgen %s | grep "add_ps" | count 3 // XFAIL: vg_leak class ValueType { diff --git a/test/TableGen/foreach.td b/test/TableGen/foreach.td index 814ae6e..902af252 100644 --- a/test/TableGen/foreach.td +++ b/test/TableGen/foreach.td @@ -1,6 +1,6 @@ -// RUN: llvm-tblgen %s | grep {Jr} | count 2 -// RUN: llvm-tblgen %s | grep {Sr} | count 2 -// RUN: llvm-tblgen %s | grep {"NAME"} | count 1 +// RUN: llvm-tblgen %s | grep 'Jr' | count 2 +// RUN: llvm-tblgen %s | grep 'Sr' | count 2 +// RUN: llvm-tblgen %s | grep '"NAME"' | count 1 // XFAIL: vg_leak // Variables for foreach diff --git a/test/TableGen/lisp.td b/test/TableGen/lisp.td index 025aca9..dd85ddc 100644 --- a/test/TableGen/lisp.td +++ b/test/TableGen/lisp.td @@ -1,4 +1,4 @@ -// RUN: llvm-tblgen %s | grep {} +// RUN: llvm-tblgen %s | grep "" // XFAIL: vg_leak class List n> { diff --git a/test/TableGen/subst.td b/test/TableGen/subst.td index 5a73ec4..850ac38 100644 --- a/test/TableGen/subst.td +++ b/test/TableGen/subst.td @@ -1,9 +1,9 @@ -// RUN: llvm-tblgen %s | grep {Smith} | count 7 -// RUN: llvm-tblgen %s | grep {Johnson} | count 2 -// RUN: llvm-tblgen %s | grep {FIRST} | count 1 -// RUN: llvm-tblgen %s | grep {LAST} | count 1 -// RUN: llvm-tblgen %s | grep {TVAR} | count 2 -// RUN: llvm-tblgen %s | grep {Bogus} | count 1 +// RUN: llvm-tblgen %s | grep "Smith" | count 7 +// RUN: llvm-tblgen %s | grep "Johnson" | count 2 +// RUN: llvm-tblgen %s | grep "FIRST" | count 1 +// RUN: llvm-tblgen %s | grep "LAST" | count 1 +// RUN: llvm-tblgen %s | grep "TVAR" | count 2 +// RUN: llvm-tblgen %s | grep "Bogus" | count 1 // XFAIL: vg_leak class Honorific { -- cgit v1.1