[llvm-commits] [test-suite] r105367 - in /test-suite/trunk/SingleSource/Regression/C: Makefile globalrefs.c globalrefs.reference_output

[Daniel Dunbar]

Author: ddunbar
Date: Wed Jun  2 19:07:38 2010
New Revision: 105367

URL: http://llvm.org/viewvc/llvm-project?rev=105367&view=rev
Log:
Rewrite globalrefs to not depend on int/long size differences, this fixes the
x86/x86_64 reference output mismatch. This butchers the test a bit, but it
wasn't that interesting of a test to start with.

Modified:
    test-suite/trunk/SingleSource/Regression/C/Makefile
    test-suite/trunk/SingleSource/Regression/C/globalrefs.c
    test-suite/trunk/SingleSource/Regression/C/globalrefs.reference_output

Modified: test-suite/trunk/SingleSource/Regression/C/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Regression/C/Makefile?rev=105367&r1=105366&r2=105367&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/C/Makefile (original)
+++ test-suite/trunk/SingleSource/Regression/C/Makefile Wed Jun  2 19:07:38 2010
@@ -2,7 +2,7 @@
 
 ifeq ($(ARCH),x86)
 ifdef USE_REFERENCE_OUTPUT
-EXEC_XFAILS = casts globalrefs
+EXEC_XFAILS = casts
 endif
 endif
 

Modified: test-suite/trunk/SingleSource/Regression/C/globalrefs.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Regression/C/globalrefs.c?rev=105367&r1=105366&r2=105367&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/C/globalrefs.c (original)
+++ test-suite/trunk/SingleSource/Regression/C/globalrefs.c Wed Jun  2 19:07:38 2010
@@ -11,8 +11,9 @@
 #include <inttypes.h>
 
 struct test {
-  long A;
+  int A;
   struct { unsigned X; unsigned Y; } S;
+  int B;
   struct test* next;
 };
 
@@ -37,9 +38,6 @@
 {
   unsigned long diff1, diff2, diff3, diff4; 
 
-  printf("sizeof(struct Test) = %d\n\n", (int)sizeof(struct test));
-
-  printdiff(&TestArray[3], TestArray);
   printdiff(&Test1.S.Y, &Test1.A);
   printdiff(&Test1.next, &Test1.S.Y);
   printf("\n");
@@ -48,7 +46,9 @@
   diff3 = (unsigned long) &Test1.S.Y - (unsigned long) &Test1.A;
   diff4 = (unsigned long) &Test1.next - (unsigned long) &Test1.S.Y;
 
-  printf("&TestArray[3] - TestArray = 0x%lx\n", diff1);
+  if (diff1 != (diff1 / sizeof(*TestArray)) * sizeof(*TestArray))
+    return 1;
+  printf("&TestArray[3] - TestArray = 0x%lx\n", diff1 / sizeof(*TestArray));
   printf("Xptr - Aptr          = 0x%lx\n", diff3);
   printf("NextPtr - Xptr       = 0x%lx\n\n", diff4);
 
@@ -56,7 +56,9 @@
   diff3 = (unsigned long) Yptr - (unsigned long) Aptr;
   diff4 = (unsigned long) NextPtr - (unsigned long) Yptr;
 
-  printf("&TestArray[3] - TestArray = 0x%lx\n", diff1);
+  if (diff1 != (diff1 / sizeof(*TestArray)) * sizeof(*TestArray))
+    return 1;
+  printf("&TestArray[3] - TestArray = 0x%lx\n", diff1 / sizeof(*TestArray));
   printf("Xptr - Aptr          = 0x%lx\n", diff3);
   printf("NextPtr - Xptr       = 0x%lx\n\n", diff4);
 

Modified: test-suite/trunk/SingleSource/Regression/C/globalrefs.reference_output
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Regression/C/globalrefs.reference_output?rev=105367&r1=105366&r2=105367&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/C/globalrefs.reference_output (original)
+++ test-suite/trunk/SingleSource/Regression/C/globalrefs.reference_output Wed Jun  2 19:07:38 2010
@@ -1,12 +1,10 @@
-sizeof(struct Test) = 24
+ 8 8
+&TestArray[3] - TestArray = 0x3
+Xptr - Aptr          = 0x8
+NextPtr - Xptr       = 0x8
 
- 72 12 4
-&TestArray[3] - TestArray = 0x48
-Xptr - Aptr          = 0xc
-NextPtr - Xptr       = 0x4
-
-&TestArray[3] - TestArray = 0x48
-Xptr - Aptr          = 0xc
-NextPtr - Xptr       = 0x4
+&TestArray[3] - TestArray = 0x3
+Xptr - Aptr          = 0x8
+NextPtr - Xptr       = 0x8
 
 exit 0