facebook
/
zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed extension comparision logic, added new test cases

dev
Shashank Tavildar 2019-10-29 13:36:09 -07:00
parent c5060997e9
commit 6d0b7bd6ce
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
programs/util.c
View File

@ -326,11 +326,6 @@ int UTIL_prepareFileList(const char *dirName, char** bufStart, size_t* pos, char
#endif /* #ifdef _WIN32 */ #endif /* #ifdef _WIN32 */
/* Check if the file is Compressed by comparing it with compressFileExtension list.
YES => Skip the file (return 1)
NO => return 0
*/
int UTIL_isCompressedFile(const char *inputName, const char *extensionList[]) int UTIL_isCompressedFile(const char *inputName, const char *extensionList[])
{ {
const char* ext = UTIL_getFileExtension(inputName); const char* ext = UTIL_getFileExtension(inputName);
@ -338,8 +333,8 @@ int UTIL_isCompressedFile(const char *inputName, const char *extensionList[])
{ {
while(*extensionList!=NULL) while(*extensionList!=NULL)
{ {
const char* isCompressedExtension = strstr(ext,*extensionList); const int isCompressedExtension = strcmp(ext,*extensionList);
if(isCompressedExtension) if(isCompressedExtension==0)
return 1; return 1;
++extensionList; ++extensionList;
} }

14
tests/playTests.sh
View File

@ -225,8 +225,8 @@ sleep 5
./datagen $size > precompressedFilterTestDir/input.7 ./datagen $size > precompressedFilterTestDir/input.7
./datagen $size > precompressedFilterTestDir/input.8 ./datagen $size > precompressedFilterTestDir/input.8
$ZSTD --exclude-compressed --long --rm -r precompressedFilterTestDir $ZSTD --exclude-compressed --long --rm -r precompressedFilterTestDir
test ! -f input.5.zst.zst test ! -f precompressedFilterTestDir/input.5.zst.zst
test ! -f input.6.zst.zst test ! -f precompressedFilterTestDir/input.6.zst.zst
file1timestamp=`date -r precompressedFilterTestDir/input.5.zst +%s` file1timestamp=`date -r precompressedFilterTestDir/input.5.zst +%s`
file2timestamp=`date -r precompressedFilterTestDir/input.7.zst +%s` file2timestamp=`date -r precompressedFilterTestDir/input.7.zst +%s`
if [[ $file2timestamp -ge $file1timestamp ]]; then if [[ $file2timestamp -ge $file1timestamp ]]; then
@ -234,6 +234,16 @@ if [[ $file2timestamp -ge $file1timestamp ]]; then
else else
println "Test is not successful" println "Test is not successful"
fi fi
#File Extension check.
./datagen $size > precompressedFilterTestDir/input.zstbar
$ZSTD --exclude-compressed --long --rm -r precompressedFilterTestDir
#ZSTD should compress input.zstbar
test -f precompressedFilterTestDir/input.zstbar.zst
#Check without the --exclude-compressed flag
$ZSTD --long --rm -r precompressedFilterTestDir
#Files should get compressed again without the --exclude-compressed flag.
test -f precompressedFilterTestDir/input.5.zst.zst
test -f precompressedFilterTestDir/input.6.zst.zst
println "Test completed" println "Test completed"
println "test : file removal" println "test : file removal"