[llvm-commits] [llvm-gcc-4.2] r46239 - in /llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg: next-runtime-1-64bit.m next-runtime-1.m objc-gc-section-1.m objc-gc-section-2.m objc2-protocol-enc-1.m symtab-1-64bit.m symtab-1.m

[Dale Johannesen]

Author: johannes
Date: Mon Jan 21 20:15:50 2008
New Revision: 46239

URL: http://llvm.org/viewvc/llvm-project?rev=46239&view=rev
Log:
Upgrade some testcases that scan-assembler to accept
functionally equivalent syntax produced by llvm.


Modified:
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/next-runtime-1-64bit.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/next-runtime-1.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-gc-section-1.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-gc-section-2.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-protocol-enc-1.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/symtab-1-64bit.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/symtab-1.m

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/next-runtime-1-64bit.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/next-runtime-1-64bit.m?rev=46239&r1=46238&r2=46239&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/next-runtime-1-64bit.m (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/next-runtime-1-64bit.m Mon Jan 21 20:15:50 2008
@@ -14,4 +14,5 @@
 - (void)boo { }
 @end
 
-/* { dg-final { scan-assembler "L_OBJC_MODULES:\n\[ \t\]*\.quad\t7\n" } } */
+/* LLVM LOCAL accept llvm syntax */
+/* { dg-final { scan-assembler "L_OBJC_MODULES:.*\n\[ \t\]*\.quad\t7\n" } } */

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/next-runtime-1.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/next-runtime-1.m?rev=46239&r1=46238&r2=46239&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/next-runtime-1.m (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/next-runtime-1.m Mon Jan 21 20:15:50 2008
@@ -20,4 +20,5 @@
 @end
 
 /* APPLE LOCAL radar 4585769 */
-/* { dg-final { scan-assembler "L_OBJC_MODULES:\n\[ \t\]*\.long\t7\n" } } */
+/* LLVM LOCAL accept llvm syntax */
+/* { dg-final { scan-assembler "L_OBJC_MODULES:.*\n\[ \t\]*\.long\t7\n" } } */

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-gc-section-1.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-gc-section-1.m?rev=46239&r1=46238&r2=46239&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-gc-section-1.m (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-gc-section-1.m Mon Jan 21 20:15:50 2008
@@ -9,6 +9,7 @@
 @end
 @implementation  INTF
 @end
-/* { dg-final { scan-assembler ".section __OBJC, __image_info" } } */
-/* { dg-final { scan-assembler "L_OBJC_IMAGE_INFO:\n\t.space 8" } } */
-
+/* LLVM LOCAL begin llvm syntax */
+/* { dg-final { scan-assembler ".section __OBJC,.*__image_info" } } */
+/* { dg-final { scan-assembler "L_OBJC_IMAGE_INFO:.*\n\t.space( |\t)8" } } */
+/* LLVM LOCAL end */

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-gc-section-2.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-gc-section-2.m?rev=46239&r1=46238&r2=46239&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-gc-section-2.m (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-gc-section-2.m Mon Jan 21 20:15:50 2008
@@ -8,5 +8,7 @@
 @end
 @implementation  INTF
 @end
-/* { dg-final { scan-assembler ".section __OBJC, __image_info" } } */
-/* { dg-final { scan-assembler "L_OBJC_IMAGE_INFO:\n\t.long\t0\n\t.long\t6" } } */
+/* LLVM LOCAL begin accept llvm syntax */
+/* { dg-final { scan-assembler ".section __OBJC,.*__image_info" } } */
+/* { dg-final { scan-assembler "L_OBJC_IMAGE_INFO:.*\n\t(.long\t0|.space\t4)\n\t.long\t6" } } */
+/* LLVM LOCAL end */

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-protocol-enc-1.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-protocol-enc-1.m?rev=46239&r1=46238&r2=46239&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-protocol-enc-1.m (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-protocol-enc-1.m Mon Jan 21 20:15:50 2008
@@ -28,9 +28,10 @@
 @dynamic x, xy, xyz, fooxyz;
 @end
 
-
-/* { dg-final { scan-assembler ".ascii.*T\@.*<X><Y><Z>.*" } } */
-/* { dg-final { scan-assembler ".ascii.*T\@.*Foo<X><Y><Z>.*" } } */
+/* LLVM LOCAL begin accept llvm syntax (asciz) */
+/* { dg-final { scan-assembler ".asci.*T\@.*<X><Y><Z>.*" } } */
+/* { dg-final { scan-assembler ".asci.*T\@.*Foo<X><Y><Z>.*" } } */
+/* LLVM LOCAL end */
 
 /**
 This protocol should generate the following metadata:

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/symtab-1-64bit.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/symtab-1-64bit.m?rev=46239&r1=46238&r2=46239&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/symtab-1-64bit.m (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/symtab-1-64bit.m Mon Jan 21 20:15:50 2008
@@ -22,4 +22,5 @@
 @end
 
 /* APPLE LOCAL testing */
-/* { dg-final { scan-assembler "L_OBJC_SYMBOLS.*:\n\t.quad\t0\n\t.long\t0\n\t.space 4\n\t.(short|word)\t2\n\t.(short|word)\t0\n\t.space 4\n\t.quad\tL_OBJC_CLASS_Derived.*\n\t.quad\tL_OBJC_CLASS_Base.*\n" } } */
+/* LLVM LOCAL accept llvm syntax */
+/* { dg-final { scan-assembler "L_OBJC_SYMBOLS.*:.*\n\t(.quad\t0|.space\t8)\n\t(.long\t0\n\t.space 4|.space\t8)\n\t.(short|word)\t2\n\t.((short|word)\t0|space\t2)\n\t.space( |\t)4\n\t.quad\tL_OBJC_CLASS_Derived.*\n\t.quad\tL_OBJC_CLASS_Base.*\n" } } */

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/symtab-1.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/symtab-1.m?rev=46239&r1=46238&r2=46239&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/symtab-1.m (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/symtab-1.m Mon Jan 21 20:15:50 2008
@@ -25,4 +25,5 @@
 @end
 
 /* APPLE LOCAL testing */
-/* { dg-final { scan-assembler "L_OBJC_SYMBOLS.*:\n\t.long\t0\n\t.long\t0\n\t.(short|word)\t2\n\t.(short|word)\t0\n\t.long\tL_OBJC_CLASS_Derived.*\n\t.long\tL_OBJC_CLASS_Base.*\n" } } */
+/* LLVM LOCAL llvm syntax */
+/* { dg-final { scan-assembler "L_OBJC_SYMBOLS.*:.*\n\t(.long\t0|.space\t4)\n\t(.long\t0|.space\t4)\n\t.(short|word)\t2\n\t.((short|word)\t0|space\t2)\n\t.long\tL_OBJC_CLASS_Derived.*\n\t.long\tL_OBJC_CLASS_Base.*\n" } } */