sharpetronics/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-10-10 00:03:36 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #578 from inikep/dev

Browse Source 
decompression: --rm is silent when input is stdin
This commit is contained in:
Yann Collet 2017-02-28 15:21:28 -08:00 committed by GitHub
commit a5cbc02ed1
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -4,7 +4,7 @@ dist: trusty
matrix: matrix:
fast_finish: true fast_finish: true
include: include:
# other feature branches => short tests # Ubuntu 14.04
- env: Cmd="make libc6install && make -C tests test32" - env: Cmd="make libc6install && make -C tests test32"
- env: Cmd='make valgrindinstall arminstall ppcinstall arm-ppc-compilation && make clean lib && CFLAGS="-O1 -g" make -C zlibWrapper valgrindTest && make -C tests valgrindTest' - env: Cmd='make valgrindinstall arminstall ppcinstall arm-ppc-compilation && make clean lib && CFLAGS="-O1 -g" make -C zlibWrapper valgrindTest && make -C tests valgrindTest'
@ -25,10 +25,11 @@ script:
# cron & master => full tests, as this is the final step towards a Release # cron & master => full tests, as this is the final step towards a Release
# pull requests => normal tests (job numbers 1-3) # pull requests => normal tests (job numbers 1-3)
# other feature branches => short tests (job numbers 1-2) # other feature branches => short tests (job numbers 1-2)
- echo JOB_NUMBER=$JOB_NUMBER TRAVIS_BRANCH=$TRAVIS_BRANCH TRAVIS_EVENT_TYPE=$TRAVIS_EVENT_TYPE TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST
- if [ "$TRAVIS_EVENT_TYPE" = "cron" ] || [ "$TRAVIS_BRANCH" = "master" ]; then - if [ "$TRAVIS_EVENT_TYPE" = "cron" ] || [ "$TRAVIS_BRANCH" = "master" ]; then
FUZZERTEST=-T7mn sh -c "$Cmd" || travis_terminate 1; FUZZERTEST=-T7mn sh -c "$Cmd" || travis_terminate 1;
else else
if [ "$TRAVIS_PULL_REQUEST" == "true" ] && [ $JOB_NUMBER -lt 4 ]; then if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ] && [ $JOB_NUMBER -lt 4 ]; then
sh -c "$Cmd" || travis_terminate 1; sh -c "$Cmd" || travis_terminate 1;
else else
if [ $JOB_NUMBER -lt 3 ]; then if [ $JOB_NUMBER -lt 3 ]; then

2
programs/fileio.c
View File

@ -954,7 +954,7 @@ static int FIO_decompressSrcFile(dRess_t ress, const char* dstFileName, const ch
/* Close file */ /* Close file */
if (fclose(srcFile)) EXM_THROW(33, "zstd: %s close error", srcFileName); /* error should never happen */ if (fclose(srcFile)) EXM_THROW(33, "zstd: %s close error", srcFileName); /* error should never happen */
if (g_removeSrcFile) { if (remove(srcFileName)) EXM_THROW(34, "zstd: %s: %s", srcFileName, strerror(errno)); }; if (g_removeSrcFile /* --rm */ && strcmp(srcFileName, stdinmark)) { if (remove(srcFileName)) EXM_THROW(34, "zstd: %s: %s", srcFileName, strerror(errno)); };
return 0; return 0;
} }

5
tests/gzip/Makefile
View File

@ -12,7 +12,10 @@ VOID = /dev/null
export PATH := .:$(PATH) export PATH := .:$(PATH)
.PHONY: all .PHONY: all
all: test-gzip-env test-helin-segv test-hufts test-keep test-list test-memcpy-abuse test-mixed test-null-suffix-clobber test-stdin test-trailing-nul test-unpack-invalid test-zdiff test-zgrep-context test-zgrep-f test-zgrep-signal test-znew-k test-z-suffix #all: test-gzip-env
all: test-helin-segv test-hufts test-keep test-list test-memcpy-abuse test-mixed
all: test-null-suffix-clobber test-stdin test-trailing-nul test-unpack-invalid
all: test-zdiff test-zgrep-context test-zgrep-f test-zgrep-signal test-znew-k test-z-suffix
@echo Testing completed @echo Testing completed
.PHONY: zstd .PHONY: zstd

7
tests/gzip/gzip-env.sh
View File

@ -17,13 +17,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# limit so don't run it by default. # limit so don't run it by default.
echo XXX=$PATH
gzip --version
. "${srcdir=.}/init.sh"; path_prepend_ . . "${srcdir=.}/init.sh"; path_prepend_ .
echo XXX=$PATH #echo PATH=$PATH
gzip --version #gzip --version
echo a >exp || framework_failure_ echo a >exp || framework_failure_
gzip <exp >in || framework_failure_ gzip <exp >in || framework_failure_