changeset 7:02ad5f8614e8

Test suite improvements.
author Gregor Richards <Richards@codu.org>
date Mon, 14 Dec 2009 10:52:03 -0500
parents c8c435a06d13
children 1e322f644912
files elfload/test/common/Makefile elfload/test/common/libc_wrap.c elfload/test/common/testdl.c elfload/test/i686-pc-linux-gnu/Makefile
diffstat 4 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/elfload/test/common/Makefile	Mon Dec 14 10:51:51 2009 -0500
+++ b/elfload/test/common/Makefile	Mon Dec 14 10:52:03 2009 -0500
@@ -1,4 +1,5 @@
 CC=gcc
+LD=ld
 CFLAGS=
 LDFLAGS=
 SOFLAGS=-shared -soname=
@@ -12,19 +13,19 @@
 all: teststatic testhost testso.so testdl libc.so
 
 teststatic: $(TESTSTATIC_OBJS)
-	ld $(LDFLAGS) $(TESTSTATIC_OBJS) -o teststatic
+	$(LD) $(LDFLAGS) $(TESTSTATIC_OBJS) -o teststatic
 
 testhost: $(TESTHOST_OBJS) testso.so
-	ld $(LDFLAGS) $(TESTHOST_OBJS) testso.so -o testhost
+	$(LD) $(LDFLAGS) $(TESTHOST_OBJS) testso.so -o testhost
 
 testso.so: $(TESTSO_OBJS)
-	ld $(LDFLAGS) $(TESTSO_OBJS) $(SOFLAGS)testso.so -o testso.so
+	$(LD) $(LDFLAGS) $(TESTSO_OBJS) $(SOFLAGS)testso.so -o testso.so
 
 testdl: libc.so $(TESTDL_OBJS)
-	ld $(LDFLAGS) $(TESTDL_OBJS) libc.so -o testdl
+	$(LD) $(LDFLAGS) $(TESTDL_OBJS) libc.so -o testdl
 
 libc.so: $(LIBC_OBJS)
-	ld $(LDFLAGS) $(LIBC_OBJS) $(SOFLAGS)libhost_libc.so.6 -o libc.so
+	$(LD) $(LDFLAGS) $(LIBC_OBJS) $(SOFLAGS)libhost_.so -o libc.so
 
 .s.o:
 	$(CC) $(CFLAGS) -c $< -o $@
--- a/elfload/test/common/libc_wrap.c	Mon Dec 14 10:51:51 2009 -0500
+++ b/elfload/test/common/libc_wrap.c	Mon Dec 14 10:52:03 2009 -0500
@@ -1,2 +1,3 @@
 void puts(){}
 void printf(){}
+void exit(){}
--- a/elfload/test/common/testdl.c	Mon Dec 14 10:51:51 2009 -0500
+++ b/elfload/test/common/testdl.c	Mon Dec 14 10:52:03 2009 -0500
@@ -1,7 +1,8 @@
 #include <stdio.h>
+#include <stdlib.h>
 
 void _start()
 {
     printf("Hello, world!\n");
-    while (1);
+    exit(0);
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/elfload/test/i686-pc-linux-gnu/Makefile	Mon Dec 14 10:52:03 2009 -0500
@@ -0,0 +1,1 @@
+include ../common/Makefile