diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 2 | ||||
| -rw-r--r-- | test/c/Makefile | 2 | ||||
| -rw-r--r-- | test/c/knucleotide.c | 3 | ||||
| -rw-r--r-- | test/compression/Makefile | 2 | ||||
| -rw-r--r-- | test/raytracer/Makefile | 2 | ||||
| -rw-r--r-- | test/regression/Makefile | 13 |
6 files changed, 17 insertions, 7 deletions
diff --git a/test/Makefile b/test/Makefile index ab44be54..5aa115d8 100644 --- a/test/Makefile +++ b/test/Makefile @@ -4,7 +4,7 @@ all: for i in $(DIRS); do $(MAKE) -C $$i all; done test: - for i in $(DIRS); do $(MAKE) -C $$i test; done + set -e; for i in $(DIRS); do $(MAKE) -C $$i test; done bench: for i in $(DIRS); do $(MAKE) -C $$i bench; done diff --git a/test/c/Makefile b/test/c/Makefile index a81a9d5c..59a0d834 100644 --- a/test/c/Makefile +++ b/test/c/Makefile @@ -38,7 +38,7 @@ test: @for i in $(PROGS); do \ if ./$$i.compcert | cmp -s - Results/$$i; \ then echo "$$i: passed"; \ - else echo "$$i: FAILED"; \ + else echo "$$i: FAILED"; exit 2; \ fi; \ done diff --git a/test/c/knucleotide.c b/test/c/knucleotide.c index f7438926..6bd0e9e7 100644 --- a/test/c/knucleotide.c +++ b/test/c/knucleotide.c @@ -62,10 +62,11 @@ struct ht_node *ht_node_create(char *key) { perror("malloc ht_node"); exit(1); } - if ((newkey = (char *)strdup(key)) == 0) { + if ((newkey = malloc(strlen(key) + 1)) == 0) { perror("strdup newkey"); exit(1); } + strcpy(newkey, key); node->key = newkey; node->val = 0; node->next = (struct ht_node *)NULL; diff --git a/test/compression/Makefile b/test/compression/Makefile index e35e1a1c..d951c08f 100644 --- a/test/compression/Makefile +++ b/test/compression/Makefile @@ -44,7 +44,7 @@ test: ./$$i -d -i $(TESTCOMPR) -o $(TESTEXPND); \ if cmp $(TESTFILE) $(TESTEXPND); \ then echo "$$i: passed"; \ - else echo "$$i: FAILED"; \ + else echo "$$i: FAILED"; exit 2; \ fi; \ done rm -f $(TESTCOMPR) $(TESTEXPND) diff --git a/test/raytracer/Makefile b/test/raytracer/Makefile index c6eb1907..1d4882bc 100644 --- a/test/raytracer/Makefile +++ b/test/raytracer/Makefile @@ -54,7 +54,7 @@ test: ./render < kal.gml @if cmp kal.ppm Results/kal.ppm; \ then echo "raytracer: passed"; \ - else echo "raytracer: FAILED"; \ + else echo "raytracer: FAILED"; exit 2; \ fi bench: diff --git a/test/regression/Makefile b/test/regression/Makefile index 00c80047..2f70c63a 100644 --- a/test/regression/Makefile +++ b/test/regression/Makefile @@ -23,9 +23,18 @@ TESTS=int32 int64 floats floats-basics \ TESTS_COMP=attribs1 bitfields1 bitfields2 bitfields3 bitfields4 \ bitfields5 bitfields6 bitfields7 bitfields8 \ - builtins-$(ARCH) packedstruct1 packedstruct2 alignas \ + builtins-$(ARCH) packedstruct2 alignas \ varargs1 varargs2 sections alias +# packedstruct1 makes unaligned memory accesses + +ifeq ($(ARCH),powerpc) +TESTS_COMP+=packedstruct1 +endif +ifeq ($(ARCH),ia32) +TESTS_COMP+=packedstruct1 +endif + # Can run, both in compiled mode and in interpreter mode, # but produce processor-dependent results, so no reference output in Results @@ -66,7 +75,7 @@ test: @for i in $(TESTS) $(TESTS_COMP); do \ if ./$$i.compcert | cmp -s - Results/$$i; \ then echo "$$i: passed"; \ - else echo "$$i: FAILED"; \ + else echo "$$i: FAILED"; exit 2; \ fi; \ done @for i in $(TESTS); do \ |