From 30fbbdb86d2a2989062a9c82dc770a923fb19643 Mon Sep 17 00:00:00 2001 From: xleroy Date: Tue, 14 Sep 2010 08:15:13 +0000 Subject: No crash if nonexistent input file. Heuristic to choose test data. git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@1509 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e --- test/compression/Makefile | 3 ++- test/compression/bitfile.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'test/compression') diff --git a/test/compression/Makefile b/test/compression/Makefile index ba83c87..e211a58 100644 --- a/test/compression/Makefile +++ b/test/compression/Makefile @@ -24,12 +24,13 @@ LZSS_OBJS=$(COMMON_OBJS) lzvars.o lzhash.o lzencode.o lzdecode.o lzssmain.o lzss: $(LZSS_OBJS) $(CC) $(CFLAGS) -o $@ $(LZSS_OBJS) $(LIBS) -TESTFILE=/mach_kernel +TESTFILE:=$(firstword $(wildcard /mach_kernel) $(wildcard /boot/vmlinuz) ./lzss) TESTCOMPR=/tmp/testcompr.out TESTEXPND=/tmp/testexpnd.out test: rm -f $(TESTCOMPR) $(TESTEXPND) + @echo "Test data: $(TESTFILE)" @for i in $(EXE); do \ echo "$$i: compression..."; \ ./$$i -c -i $(TESTFILE) -o $(TESTCOMPR); \ diff --git a/test/compression/bitfile.c b/test/compression/bitfile.c index 7480ce9..399aefb 100644 --- a/test/compression/bitfile.c +++ b/test/compression/bitfile.c @@ -162,7 +162,7 @@ bit_file_t *BitFileOpen(const char *fileName, const BF_MODES mode) { /* fopen failed */ free(bf); - bf = NULL; + return NULL; } else { -- cgit v1.2.3