diff options
| author | Yann Collet <yann.collet.73@gmail.com> | 2015-05-18 21:35:09 (GMT) |
|---|---|---|
| committer | Yann Collet <yann.collet.73@gmail.com> | 2015-05-18 21:35:09 (GMT) |
| commit | a9ff13a8bb9932a4784b9cbb654075dfff7652fe (patch) | |
| tree | 495c46ae36373b68d9c8aaf28574d275a5b8a51d | |
| parent | 58b5aadb1fc5d937e81c8f33e0e8290f2097c6bb (diff) | |
| download | lz4-a9ff13a8bb9932a4784b9cbb654075dfff7652fe.zip lz4-a9ff13a8bb9932a4784b9cbb654075dfff7652fe.tar.gz lz4-a9ff13a8bb9932a4784b9cbb654075dfff7652fe.tar.bz2 | |
minor test refactor
| -rw-r--r-- | programs/Makefile | 14 | ||||
| -rw-r--r-- | programs/lz4io.c | 5 |
2 files changed, 11 insertions, 8 deletions
diff --git a/programs/Makefile b/programs/Makefile index 7e04811..3548ceb 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -172,7 +172,7 @@ test-lz4-sparse: lz4 datagen ./lz4 COPYING | ./lz4 -d | cat test-lz4-contentSize: lz4 datagen - @echo ---- test original size support ---- + @echo "\n ---- test original size support ----" ./datagen -g15M > tmp ./lz4 -v tmp | ./lz4 -t ./lz4 -v --content-size tmp | ./lz4 -d > tmp2 @@ -185,7 +185,7 @@ test-lz4-contentSize: lz4 datagen @rm tmp* test-lz4-frame-concatenation: lz4 datagen - @echo ---- test frame concatenation ---- + @echo "\n ---- test frame concatenation ----" @echo -n > empty.test @echo hi > nonempty.test cat nonempty.test empty.test nonempty.test > orig.test @@ -198,7 +198,7 @@ test-lz4-frame-concatenation: lz4 datagen @echo frame concatenation test completed test-lz4-multiple: lz4 datagen - @echo ---- test multiple files ---- + @echo "\n ---- test multiple files ----" @./datagen -s1 > tmp1 2> $(VOID) @./datagen -s2 -g100K > tmp2 2> $(VOID) @./datagen -s3 -g1M > tmp3 2> $(VOID) @@ -210,8 +210,8 @@ test-lz4-multiple: lz4 datagen ./lz4 -f -m tmp1 notHere tmp2; echo $$? @rm tmp* -test-lz4: lz4 datagen test-lz4-multiple test-lz4-sparse test-lz4-contentSize test-lz4-frame-concatenation - @echo ---- test lz4 basic compression/decompression ---- +test-lz4-basic: lz4 datagen + @echo "\n ---- test lz4 basic compression/decompression ----" ./datagen -g0 | ./lz4 -v | ./lz4 -t ./datagen -g16KB | ./lz4 -9 | ./lz4 -t ./datagen | ./lz4 | ./lz4 -t @@ -221,7 +221,9 @@ test-lz4: lz4 datagen test-lz4-multiple test-lz4-sparse test-lz4-contentSize tes ./datagen -g256MB | ./lz4 -vqB4D | ./lz4 -t ./datagen -g6GB | ./lz4 -vqB5D | ./lz4 -qt ./datagen -g6GB | ./lz4 -vq9BD | ./lz4 -qt - @echo ---- test pass-through ---- + +test-lz4: lz4 datagen test-lz4-basic test-lz4-multiple test-lz4-sparse test-lz4-contentSize test-lz4-frame-concatenation + @echo "\n ---- test pass-through ----" ./datagen | ./lz4 -tf test-lz4c: lz4c datagen diff --git a/programs/lz4io.c b/programs/lz4io.c index 92f8706..8b80fbc 100644 --- a/programs/lz4io.c +++ b/programs/lz4io.c @@ -301,12 +301,13 @@ static int LZ4IO_getFiles(const char* input_filename, const char* output_filenam *pfoutput = fopen( output_filename, "wb" ); } - if ( *pfoutput==0) EXM_THROW(13, "Pb opening %s", output_filename); + if (*pfoutput==0) EXM_THROW(13, "Pb opening %s", output_filename); if (g_sparseFileSupport) { long int ftr = ftell(*pfoutput); - if (ftr==-1) g_sparseFileSupport = 0; + /* DISPLAY("%s->%s ==> %i \n", input_filename, output_filename, (int)ftr); */ + if (ftr!=0) g_sparseFileSupport = 0; } return 0; |