Test Linking C-Compiled Library and C++-Compiled Tests
This commit is contained in:
parent
843dfd239a
commit
c746a27e91
@ -49,6 +49,10 @@ matrix:
|
|||||||
packages:
|
packages:
|
||||||
- valgrind
|
- valgrind
|
||||||
|
|
||||||
|
- env: Ubu=14.04 Cmd='make ctocpptest' COMPILER=cc
|
||||||
|
dist: trusty
|
||||||
|
sudo: false
|
||||||
|
|
||||||
- env: Ubu=14.04 Cmd='make -C tests test-lz4c32 test-fullbench32 versionsTest' COMPILER=cc
|
- env: Ubu=14.04 Cmd='make -C tests test-lz4c32 test-fullbench32 versionsTest' COMPILER=cc
|
||||||
dist: trusty
|
dist: trusty
|
||||||
sudo: required
|
sudo: required
|
||||||
|
8
Makefile
8
Makefile
@ -172,6 +172,14 @@ gpptest gpptest32: clean
|
|||||||
CC=$(CC) $(MAKE) -C $(PRGDIR) all CFLAGS="$(CFLAGS)"
|
CC=$(CC) $(MAKE) -C $(PRGDIR) all CFLAGS="$(CFLAGS)"
|
||||||
CC=$(CC) $(MAKE) -C $(TESTDIR) all CFLAGS="$(CFLAGS)"
|
CC=$(CC) $(MAKE) -C $(TESTDIR) all CFLAGS="$(CFLAGS)"
|
||||||
|
|
||||||
|
ctocpptest: LIBCC="$(CC)"
|
||||||
|
ctocpptest: TESTCC="$(CXX)"
|
||||||
|
ctocpptest: CFLAGS=""
|
||||||
|
ctocpptest: clean
|
||||||
|
CC=$(LIBCC) $(MAKE) -C $(LZ4DIR) CFLAGS="$(CFLAGS)" all
|
||||||
|
CC=$(LIBCC) $(MAKE) -C $(TESTDIR) CFLAGS="$(CFLAGS)" lz4.o lz4hc.o lz4frame.o
|
||||||
|
CC=$(TESTCC) $(MAKE) -C $(TESTDIR) CFLAGS="$(CFLAGS)" all
|
||||||
|
|
||||||
c_standards: clean
|
c_standards: clean
|
||||||
CFLAGS="-std=c90 -Werror" $(MAKE) clean allmost
|
CFLAGS="-std=c90 -Werror" $(MAKE) clean allmost
|
||||||
CFLAGS="-std=gnu90 -Werror" $(MAKE) clean allmost
|
CFLAGS="-std=gnu90 -Werror" $(MAKE) clean allmost
|
||||||
|
@ -11,6 +11,7 @@ test:
|
|||||||
- clang -v; make clangtest && make clean
|
- clang -v; make clangtest && make clean
|
||||||
- g++ -v; make gpptest && make clean
|
- g++ -v; make gpptest && make clean
|
||||||
- gcc -v; make c_standards && make clean
|
- gcc -v; make c_standards && make clean
|
||||||
|
- gcc -v; g++ -v; make ctocpptest && make clean
|
||||||
- gcc-5 -v; CC=gcc-5 CFLAGS="-O2 -Werror" make check && make clean
|
- gcc-5 -v; CC=gcc-5 CFLAGS="-O2 -Werror" make check && make clean
|
||||||
- gcc-5 -v; CC=gcc-5 CFLAGS="-O2 -m32 -Werror" CPPFLAGS=-I/usr/include/x86_64-linux-gnu make check && make clean
|
- gcc-5 -v; CC=gcc-5 CFLAGS="-O2 -m32 -Werror" CPPFLAGS=-I/usr/include/x86_64-linux-gnu make check && make clean
|
||||||
- gcc-6 -v; CC=gcc-6 make c_standards && make clean
|
- gcc-6 -v; CC=gcc-6 make c_standards && make clean
|
||||||
|
15
lib/lz4.c
15
lib/lz4.c
@ -496,6 +496,21 @@ int LZ4_compressBound(int isize) { return LZ4_COMPRESSBOUND(isize); }
|
|||||||
int LZ4_sizeofState() { return LZ4_STREAMSIZE; }
|
int LZ4_sizeofState() { return LZ4_STREAMSIZE; }
|
||||||
|
|
||||||
|
|
||||||
|
/*-************************************
|
||||||
|
* Internal Definitions used in Tests
|
||||||
|
**************************************/
|
||||||
|
#if defined (__cplusplus)
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int LZ4_compress_forceExtDict (LZ4_stream_t* LZ4_stream, const char* source, char* dest, int inputSize);
|
||||||
|
|
||||||
|
int LZ4_decompress_safe_extDict(const char* in, char* out, int inSize, int outSize, const void* dict, size_t dictSize);
|
||||||
|
|
||||||
|
#if defined (__cplusplus)
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/*-******************************
|
/*-******************************
|
||||||
* Compression functions
|
* Compression functions
|
||||||
********************************/
|
********************************/
|
||||||
|
@ -220,8 +220,16 @@ static int local_LZ4_compress_fast_continue0(const char* in, char* out, int inSi
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifndef LZ4_DLL_IMPORT
|
#ifndef LZ4_DLL_IMPORT
|
||||||
|
#if defined (__cplusplus)
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
/* declare hidden function */
|
/* declare hidden function */
|
||||||
int LZ4_compress_forceExtDict (LZ4_stream_t* LZ4_stream, const char* source, char* dest, int inputSize);
|
extern int LZ4_compress_forceExtDict (LZ4_stream_t* LZ4_stream, const char* source, char* dest, int inputSize);
|
||||||
|
|
||||||
|
#if defined (__cplusplus)
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static int local_LZ4_compress_forceDict(const char* in, char* out, int inSize)
|
static int local_LZ4_compress_forceDict(const char* in, char* out, int inSize)
|
||||||
{
|
{
|
||||||
@ -289,8 +297,16 @@ static int local_LZ4_decompress_safe_usingDict(const char* in, char* out, int in
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifndef LZ4_DLL_IMPORT
|
#ifndef LZ4_DLL_IMPORT
|
||||||
|
#if defined (__cplusplus)
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
extern int LZ4_decompress_safe_forceExtDict(const char* in, char* out, int inSize, int outSize, const void* dict, size_t dictSize);
|
extern int LZ4_decompress_safe_forceExtDict(const char* in, char* out, int inSize, int outSize, const void* dict, size_t dictSize);
|
||||||
|
|
||||||
|
#if defined (__cplusplus)
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static int local_LZ4_decompress_safe_forceExtDict(const char* in, char* out, int inSize, int outSize)
|
static int local_LZ4_decompress_safe_forceExtDict(const char* in, char* out, int inSize, int outSize)
|
||||||
{
|
{
|
||||||
(void)inSize;
|
(void)inSize;
|
||||||
|
Loading…
Reference in New Issue
Block a user