From 11d5bfdaa96029b1ecf03654db6969a0c3555a5d Mon Sep 17 00:00:00 2001 From: George Lu Date: Tue, 5 Jun 2018 13:55:36 -0700 Subject: [PATCH] Revert "Partial compilation test?" This reverts commit b2496ab60663992eb566dd221705da86fc9dafc7. --- lib/log | 28 -------------- tests/Makefile | 13 +------ tests/partial | Bin 13159 -> 0 bytes tests/partial.c | 100 ------------------------------------------------ 4 files changed, 1 insertion(+), 140 deletions(-) delete mode 100644 lib/log delete mode 100755 tests/partial delete mode 100644 tests/partial.c diff --git a/lib/log b/lib/log deleted file mode 100644 index 7f4d68a89..000000000 --- a/lib/log +++ /dev/null @@ -1,28 +0,0 @@ -entropy_common.o: -error_private.o: -fse_decompress.o: -pool.o: -threading.o: -xxhash.o: -zstd_common.o: -fse_compress.o: -huf_compress.o: -zstd_compress.o: -zstd_double_fast.o: -zstd_fast.o: -zstd_lazy.o: -zstd_ldm.o: -zstd_opt.o: -zstdmt_compress.o: -huf_decompress.o: -zstd_decompress.o: -zbuff_common.o: -zbuff_compress.o: -zbuff_decompress.o: -cover.o: -divsufsort.o: -zdict.o: -zstd_v04.o: -zstd_v05.o: -zstd_v06.o: -zstd_v07.o: diff --git a/tests/Makefile b/tests/Makefile index 65474db4d..c4cbe1bdf 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -233,14 +233,6 @@ else $(CC) $(FLAGS) $< -o $@$(EXT) -Wl,-rpath=$(ZSTDDIR) $(ZSTDDIR)/libzstd.so # broken on Mac endif -partial : partial.c zstd-dll -ifneq (,$(filter Windows%,$(OS))) - cp $(ZSTDDIR)/dll/libzstd.dll . - $(CC) $(FLAGS) $< -o $@$(EXT) -DZSTD_DLL_IMPORT=1 libzstd.dll -else - $(CC) $(FLAGS) $< -o $@$(EXT) -Wl,-rpath=$(ZSTDDIR) $(ZSTDDIR)/libzstd.so # broken on Mac -endif - poolTests : poolTests.c $(ZSTDDIR)/common/pool.c $(ZSTDDIR)/common/threading.c $(ZSTDDIR)/common/zstd_common.c $(ZSTDDIR)/common/error_private.c $(CC) $(FLAGS) $(MULTITHREAD) $^ -o $@$(EXT) @@ -263,7 +255,7 @@ clean: zstreamtest$(EXT) zstreamtest32$(EXT) \ datagen$(EXT) paramgrill$(EXT) roundTripCrash$(EXT) longmatch$(EXT) \ symbols$(EXT) invalidDictionaries$(EXT) legacy$(EXT) poolTests$(EXT) \ - decodecorpus$(EXT) checkTag$(EXT) partial$(EXT) + decodecorpus$(EXT) checkTag$(EXT) @echo Cleaning completed @@ -395,9 +387,6 @@ test-invalidDictionaries: invalidDictionaries test-symbols: symbols $(QEMU_SYS) ./symbols -test-partial: partial - $(QEMU_SYS) ./partial - test-legacy: legacy $(QEMU_SYS) ./legacy diff --git a/tests/partial b/tests/partial deleted file mode 100755 index 7abd3498a0a29ddbe82a832d9cd398ff54a791f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13159 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 diff --git a/tests/partial.c b/tests/partial.c deleted file mode 100644 index 8756e6c78..000000000 --- a/tests/partial.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 2016-present, Yann Collet, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under both the BSD-style license (found in the - * LICENSE file in the root directory of this source tree) and the GPLv2 (found - * in the COPYING file in the root directory of this source tree). - * You may select, at your option, one of the above-listed licenses. - */ - - -#include -#include "zstd_errors.h" -//#define ZSTD_STATIC_LINKING_ONLY -#include "zstd.h" -#define ZBUFF_DISABLE_DEPRECATE_WARNINGS -#define ZBUFF_STATIC_LINKING_ONLY -#include "zbuff.h" -#define ZDICT_DISABLE_DEPRECATE_WARNINGS -#define ZDICT_STATIC_LINKING_ONLY -#include "zdict.h" - -/* -size_t ZSTD_compress(void* dst, size_t dstCapacity, const void* src, size_t srcSize, int compressionLevel) __attribute__((weak)); //compress -size_t ZSTD_decompress( void* dst, size_t dstCapacity, const void* src, size_t compressedSize) __attribute__((weak)); //decompress -int weakfunc() __attribute__((weak)); //deprecated -int weakfunc() __attribute__((weak)); //dictbuilder -int weakfunc() __attribute__((weak)); //legacy -*/ -//size_t ZSTD_compress(void* dst, size_t dstCapacity, const void* src, size_t srcSize, int compressionLevel) __attribute__((weak)); //compress -//size_t ZSTD_decompress( void* dst, size_t dstCapacity, const void* src, size_t compressedSize) __attribute__((weak)); //decompress -unsigned ZBUFF_isError(size_t errorCode) __attribute__((weak)); //deprecated -unsigned ZDICT_isError(size_t errorCode) __attribute__((weak)); -unsigned ZBUFFv07_isError(size_t errorCode) __attribute__((weak)); -unsigned ZBUFFv06_isError(size_t errorCode) __attribute__((weak)); -unsigned ZBUFFv05_isError(size_t errorCode) __attribute__((weak)); -unsigned ZBUFFv04_isError(size_t errorCode) __attribute__((weak)); -unsigned ZBUFFv03_isError(size_t errorCode) __attribute__((weak)); -unsigned ZBUFFv02_isError(size_t errorCode) __attribute__((weak)); -unsigned ZBUFFv01_isError(size_t errorCode) __attribute__((weak)); - -int checkCompress(void) { - if(ZSTD_compress) { - return 1; - } else { - return 0; - } -} - -int checkDecompress(void) { - if(ZSTD_decompress) { - return 1; - } else { - return 0; - } -} - -int checkDeprecated(void) { - if(ZBUFF_isError) { - return 1; - } else { - return 0; - } -} - -int checkDictBuilder(void) { - if(ZDICT_isError) { - return 1; - } else { - return 0; - } -} - -int checkLegacy(void) { - if(ZBUFFv01_isError) { - return 1; - } else if (ZBUFFv02_isError) { - return 2; - } else if (ZBUFFv03_isError) { - return 3; - } else if (ZBUFFv04_isError) { - return 4; - } else if (ZBUFFv05_isError) { - return 5; - } else if (ZBUFFv06_isError) { - return 6; - } else if (ZBUFFv07_isError) { - return 7; - } - return 0; -} - -int main(void){//int argc, const char** argv) { - //const void **symbol; - //(void)argc; - //(void)argv; - - printf("%d %d %d %d %d\n", checkCompress(), checkDecompress(), checkDeprecated(), checkDictBuilder(), checkLegacy()); - return 0; -}