Patchwork [objc*,testsuite,committed] adjust test cases for NeXT.

login
register
mail settings
Submitter IainS
Date Sept. 30, 2010, 9:43 a.m.
Message ID <04FAAF8F-1ABD-4561-A1E7-78BE4EAAB3FF@sandoe-acoustics.co.uk>
Download mbox | patch
Permalink /patch/66143/
State New
Headers show

Comments

IainS - Sept. 30, 2010, 9:43 a.m.
This mops up a few test-suite adjustments as we progress through  
merging ObjC* changes.
Applied under Mike's existing rules for ObjC testsuite changes.
r164747
cheers.
Iain

	PR objc/45842
	* objc.dg/threedotthree-abi-1.m: Only apply at m32.
	* objc.dg/const-str-3.m: Correct header for memcpy.
	* objc.dg/const-str-7.m: Likewise.
	* objc.dg/method-20b.m: Provide an implementation of Object.
	Adjust XFAIL for m64 NeXT runtime.
	* objc.dg/const-str-12b.m: Use mapped data types Darwin >= 9.
	* objc.dg/encode-3.m: Correct line ordering, provide header for
	sprintf.
	* objc.dg/encode-7-next.m: Only run for 32bit.
	* objc.dg/encode-7-next-64bit.m: Only run for 64bit.
	* objc.dg/type-size-2.m: Provide an implementation of Object.
	Ajust headers.
	* obj-c++.dg/const-str-7.mm: Correct header for memcpy.
	* obj-c++.dg/const-str-12.mm: Use mapped data types Darwin >= 9.
	* obj-c++.dg/method-23.mm: Provide an implementation of Object.
	Adjust XFAIL for m64 NeXT runtime.
	* obj-c++.dg/method-22.mm: Likewise.
	* obj-c++.dg/threedotthree-abi-1.mm: Only apply at m32.

  #define METHOD Method
@@ -70,5 +73,3 @@ int main(void) {
    CHECK_IF(totsize == offs4 + sizeof(int *));
    return 0;
  }
-
-#include "../objc-obj-c++-shared/Object1-implementation.h"
IainS - Sept. 30, 2010, 9:51 a.m.
On 30 Sep 2010, at 10:43, IainS wrote:

> This mops up a few test-suite adjustments as we progress through  
> merging ObjC* changes.
> Applied under Mike's existing rules for ObjC testsuite changes.
> r164747

obj-c++ changes are 164748.
Iain
Nicola Pero - Sept. 30, 2010, 11:28 a.m.
> Applied under Mike's existing rules for ObjC testsuite changes.

What are these existing rules ?

Thanks
IainS - Sept. 30, 2010, 11:43 a.m.
On 30 Sep 2010, at 12:28, Nicola Pero wrote:
>>
>> Applied under Mike's existing rules for ObjC testsuite changes.
>
> What are these existing rules ?

he gave me specific pre-approval for test-suite only changes, since I  
am not an ObjC maintainer.

Iain.

Patch

Index: gcc/testsuite/objc.dg/threedotthree-abi-1.m
===================================================================
--- gcc/testsuite/objc.dg/threedotthree-abi-1.m	(revision 164746)
+++ gcc/testsuite/objc.dg/threedotthree-abi-1.m	(working copy)
@@ -1,14 +1,15 @@ 
  /* This file tests that things are encoded using the gcc-3.3 ABI  
which is only
     used by the NeXT runtime.  */
  /* { dg-do run { target *-*-darwin* } } */
+/* { dg-require-effective-target ilp32 } */
  /* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */
+
+#include "../objc-obj-c++-shared/Protocol1.h"
  #include <stdio.h>
  #include <string.h>
-#include "../objc-obj-c++-shared/Protocol1.h"

  extern void abort();

-
  @protocol CommonProtocol

  -(oneway void)methodCall_On:(in bycopy id)someValue_On;
Index: gcc/testsuite/objc.dg/const-str-3.m
===================================================================
--- gcc/testsuite/objc.dg/const-str-3.m	(revision 164746)
+++ gcc/testsuite/objc.dg/const-str-3.m	(working copy)
@@ -8,7 +8,7 @@ 
  #import "../objc-obj-c++-shared/next-mapping.h"
  #include <stdio.h>
  #include <stdlib.h>
-#include <memory.h>
+#include <string.h>

  @interface Foo: Object {
    char *cString;
Index: gcc/testsuite/objc.dg/const-str-7.m
===================================================================
--- gcc/testsuite/objc.dg/const-str-7.m	(revision 164746)
+++ gcc/testsuite/objc.dg/const-str-7.m	(working copy)
@@ -6,7 +6,7 @@ 
  #include "../objc-obj-c++-shared/Object1.h"
  #include <stdio.h>
  #include <stdlib.h>
-#include <memory.h>
+#include <string.h>

  @interface Foo: Object {
    char *cString;
Index: gcc/testsuite/objc.dg/method-20b.m
===================================================================
--- gcc/testsuite/objc.dg/method-20b.m	(revision 164746)
+++ gcc/testsuite/objc.dg/method-20b.m	(working copy)
@@ -2,6 +2,8 @@ 
     they should.  */
  /* { dg-do run } */
  /* { dg-options "-O2" } */
+/* { dg-additional-sources "../objc-obj-c++-shared/Object1.m" } */
+/* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { !  
objc2 } } } { "-fnext-runtime" } { "" } } */

  #include "../objc-obj-c++-shared/Object1.h"
  #include <string.h>
Index: gcc/testsuite/objc.dg/const-str-12b.m
===================================================================
--- gcc/testsuite/objc.dg/const-str-12b.m	(revision 164746)
+++ gcc/testsuite/objc.dg/const-str-12b.m	(working copy)
@@ -5,6 +5,7 @@ 
  /* { dg-do compile } */

  #include "../objc-obj-c++-shared/Object1.h"
+#import "../objc-obj-c++-shared/next-mapping.h"

  @interface Foo: Object {
    char *cString;
@@ -17,7 +18,11 @@ 
  + (Foo *) getString: (int) which;
  @end

+#ifdef NEXT_OBJC_USE_NEW_INTERFACE
+struct fudge_objc_class _FooClassReference;
+#else
  struct objc_class _FooClassReference;
+#endif

  @implementation Bar
  + (Foo *) getString: (int) which {
Index: gcc/testsuite/objc.dg/encode-3.m
===================================================================
--- gcc/testsuite/objc.dg/encode-3.m	(revision 164746)
+++ gcc/testsuite/objc.dg/encode-3.m	(working copy)
@@ -1,10 +1,11 @@ 
  /* Method encoding tests for stand-alone @protocol declarations.  */
  /* Contributed by Ziemowit Laski <zlaski@apple.com>.  */
  /* { dg-do run } */
+/* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { !  
objc2 } } } { "-fnext-runtime" } { "" } } */

+#include "../objc-obj-c++-shared/Protocol1.h"
+#include <stdio.h>
  #include <stdlib.h>
-#include "../objc-obj-c++-shared/Protocol1.h"
-/* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { !  
objc2 } } } { "-fnext-runtime" } { "" } } */

  #ifdef __cplusplus
  #define ProtoBool bool
Index: gcc/testsuite/objc.dg/encode-7-next.m
===================================================================
--- gcc/testsuite/objc.dg/encode-7-next.m	(revision 164746)
+++ gcc/testsuite/objc.dg/encode-7-next.m	(working copy)
@@ -2,7 +2,7 @@ 
  /* Author: Ziemowit Laski  <zlaski@apple.com>  */

  /* { dg-do run { target *-*-darwin* } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } { "-m64" } { "" } } */
+/* { dg-require-effective-target ilp32 } */
  /* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */

  #include "../objc-obj-c++-shared/Object1.h"
Index: gcc/testsuite/objc.dg/encode-7-next-64bit.m
===================================================================
--- gcc/testsuite/objc.dg/encode-7-next-64bit.m	(revision 164746)
+++ gcc/testsuite/objc.dg/encode-7-next-64bit.m	(working copy)
@@ -1,8 +1,9 @@ 
  /* Additional testing for the NeXT runtime. Encoding in -m64 mode  */

  /* { dg-do run { target *-*-darwin* } } */
-/* { dg-options "-m64" } */
+/* { dg-require-effective-target lp64 } */
  /* { dg-skip-if "" { *-*-* } { "-fgnu-runtime" } { "" } } */
+/* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { !  
objc2 } } } { "-fnext-runtime" } { "" } } */

  #include <objc/Object.h>
  #include <stdbool.h>
Index: gcc/testsuite/objc.dg/type-size-2.m
===================================================================
--- gcc/testsuite/objc.dg/type-size-2.m	(revision 164746)
+++ gcc/testsuite/objc.dg/type-size-2.m	(working copy)
@@ -4,9 +4,12 @@ 
  /* Contributed by Ziemowit Laski <zlaski@apple.com>.  */
  /* { dg-do run } */
  /* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 &&  
{ ! objc2 } } } { "-fnext-runtime" } { "" } } */
+/* { dg-additional-sources "../objc-obj-c++-shared/Object1.m" } */
+
  #include "../objc-obj-c++-shared/Object1.h"
  #include "../objc-obj-c++-shared/next-mapping.h"
-//#include <objc/objc.h>
+#include <stdio.h>
+#include <stdlib.h>
  #ifdef __NEXT_RUNTIME__
  #include <objc/objc-runtime.h>