diff -Nru fst-0.115.1/debian/changelog fst-0.115.2/debian/changelog --- fst-0.115.1/debian/changelog 2020-11-25 09:11:53.000000000 +0000 +++ fst-0.115.2/debian/changelog 2020-11-26 19:59:10.000000000 +0000 @@ -1,3 +1,12 @@ +fst (0.115.2-1) unstable; urgency=medium + + * New upstream version 0.115.2 + * Run test-suite during build + * Add autopkgtest + * Ignore blhc job on salsa-ci + + -- IOhannes m zmölnig (Debian/GNU) Thu, 26 Nov 2020 20:59:10 +0100 + fst (0.115.1-1) unstable; urgency=medium * New upstream version 0.115.1 diff -Nru fst-0.115.1/debian/rules fst-0.115.2/debian/rules --- fst-0.115.1/debian/rules 2020-11-25 09:11:53.000000000 +0000 +++ fst-0.115.2/debian/rules 2020-11-26 19:59:10.000000000 +0000 @@ -3,6 +3,9 @@ %: dh $@ +override_dh_auto_test: + make -C tests/ + licensecheck: licensecheck --deb-machine -r . \ > debian/copyright_newhints diff -Nru fst-0.115.1/debian/salsa-ci.yml fst-0.115.2/debian/salsa-ci.yml --- fst-0.115.1/debian/salsa-ci.yml 2020-11-25 09:11:53.000000000 +0000 +++ fst-0.115.2/debian/salsa-ci.yml 2020-11-26 19:59:10.000000000 +0000 @@ -2,3 +2,8 @@ include: - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + +# the only thing that invokes the compiler is the tests, and we don't care +# about hardening there... +blhc: + allow_failure: true diff -Nru fst-0.115.1/debian/tests/control fst-0.115.2/debian/tests/control --- fst-0.115.1/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ fst-0.115.2/debian/tests/control 2020-11-26 19:59:10.000000000 +0000 @@ -0,0 +1,7 @@ +# try building a dummy program +# - are there syntax errors in the SDK? +# - is the SDK installed properly? +# - does pkg-config work as expected +Test-Command: make -C tests "CPPFLAGS=$(pkg-config --cflags fst)" +Restrictions: allow-stderr +Depends: @, pkg-config, build-essential diff -Nru fst-0.115.1/fst/fst.h fst-0.115.2/fst/fst.h --- fst-0.115.1/fst/fst.h 2020-11-24 08:35:17.000000000 +0000 +++ fst-0.115.2/fst/fst.h 2020-11-26 17:34:03.000000000 +0000 @@ -26,7 +26,7 @@ #define FST_MAJOR_VERSION 0 #define FST_MINOR_VERSION 115 -#define FST_MICRO_VERSION 1 +#define FST_MICRO_VERSION 2 #define FST_VERSIONNUM(X, Y, Z) \ ((X)*10000 + (Y)*1000 + (Z)) @@ -43,6 +43,8 @@ # define FST_DEPRECATE_UNKNOWN(x) x __attribute__ ((deprecated)) #elif defined(_MSC_VER) # define FST_DEPRECATE_UNKNOWN(x) __declspec(deprecated) x +/* on second thought, MSVC doesn't allow to deprecate enum values, so blow it: */ +# define FST_DONT_DEPRECATE_UNKNOWN #else # define FST_DEPRECATE_UNKNOWN(x) x #endif @@ -52,14 +54,16 @@ # define FST_DEPRECATE_UNKNOWN(x) x #endif +#define FST_DEPRECATE_ENUM(x) FST_DEPRECATE_UNKNOWN(x) + #define FST_UNKNOWN(x) x #define FST_ENUM(x, y) x = y #if 0 -# define FST_ENUM_EXPERIMENTAL(x, y) FST_DEPRECATE_UNKNOWN(x) = y +# define FST_ENUM_EXPERIMENTAL(x, y) FST_DEPRECATE_ENUM(x) = y #else # define FST_ENUM_EXPERIMENTAL(x, y) x = y #endif -#define FST_ENUM_UNKNOWN(x) FST_DEPRECATE_UNKNOWN(x) = 100000 + __LINE__ +#define FST_ENUM_UNKNOWN(x) FST_DEPRECATE_ENUM(x) = (100000 + __LINE__) /* name mangling */ diff -Nru fst-0.115.1/tests/c_test.c fst-0.115.2/tests/c_test.c --- fst-0.115.1/tests/c_test.c 1970-01-01 00:00:00.000000000 +0000 +++ fst-0.115.2/tests/c_test.c 2020-11-26 17:34:03.000000000 +0000 @@ -0,0 +1,5 @@ +#include "fst/fst.h" + +int main(void) { + return 0; +} diff -Nru fst-0.115.1/tests/cxx_test.cpp fst-0.115.2/tests/cxx_test.cpp --- fst-0.115.1/tests/cxx_test.cpp 1970-01-01 00:00:00.000000000 +0000 +++ fst-0.115.2/tests/cxx_test.cpp 2020-11-26 17:34:03.000000000 +0000 @@ -0,0 +1,10 @@ +#include "fst/fst.h" + +#if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) +extern "C" +#endif + int main(void); + +int main(void) { + return 0; +} diff -Nru fst-0.115.1/tests/Makefile fst-0.115.2/tests/Makefile --- fst-0.115.1/tests/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ fst-0.115.2/tests/Makefile 2020-11-26 17:34:03.000000000 +0000 @@ -0,0 +1,26 @@ +##################################################################### +## GNUmakefile for GNU Makefiles ('make') +## +## see makefile for Windows' 'nmake' +##################################################################### + +CPPFLAGS=-I.. + +sources=c_test.c cxx_test.cpp +programs=$(patsubst %.c,%,$(filter %.c,$(sources))) $(patsubst %.cpp,%,$(filter %.cpp,$(sources))) + +.PHONY: all clean preproc + +all: $(programs) + +clean: + -rm $(programs) + -rm *.i *.ii + +preproc: $(patsubst %.c,%.i,$(filter %.c,$(sources))) $(patsubst %.cpp,%.ii,$(filter %.cpp,$(sources))) + + +%.i: %.c + $(CPP) $(CPPFLAGS) $< > $@ +%.ii: %.cpp + $(CPP) $(CPPFLAGS) $< > $@ diff -Nru fst-0.115.1/tests/makefile.msvc fst-0.115.2/tests/makefile.msvc --- fst-0.115.1/tests/makefile.msvc 1970-01-01 00:00:00.000000000 +0000 +++ fst-0.115.2/tests/makefile.msvc 2020-11-26 17:34:03.000000000 +0000 @@ -0,0 +1,13 @@ +CFLAGS=-I.. +CXXFLAGS=-I.. +CPPFLAGS=-I.. + +all: c_test.obj cxx_test.obj + +# hmm, whats a good suffix for preprocessed files? +.SUFFIXES: .i .ii +preproc: c_test.i cxx_test.ii +.cpp.ii: + $(CXX) /E $(CXXFLAGS) $< >$@ +.c.i: + $(CC) /E $(CFLAGS) $< >$@ \ No newline at end of file