summaryrefslogtreecommitdiff
path: root/test/compression
diff options
context:
space:
mode:
authorGravatar xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e>2010-09-14 08:15:13 +0000
committerGravatar xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e>2010-09-14 08:15:13 +0000
commit30fbbdb86d2a2989062a9c82dc770a923fb19643 (patch)
tree8c22adfd39d6cd687ad2bf7e5cdc46ac58cbb517 /test/compression
parentf7cc6f0b16f475480ddafe1fb1690c509e545de0 (diff)
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
Diffstat (limited to 'test/compression')
-rw-r--r--test/compression/Makefile3
-rw-r--r--test/compression/bitfile.c2
2 files changed, 3 insertions, 2 deletions
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
{