2
0
Эх сурвалжийг харах

More TravisCI testing.

"Make clean" between calls to "make".
Run tests also on OSX (using Clang).
Arthur O'Dwyer 5 жил өмнө
parent
commit
8e67ced1d1
2 өөрчлөгдсөн 16 нэмэгдсэн , 12 устгасан
  1. 12 8
      .travis.yml
  2. 4 4
      tests/Makefile

+ 12 - 8
.travis.yml

@@ -1,10 +1,14 @@
 language: cpp
-compiler:
-- clang
-- gcc
+matrix:
+  include:
+  - os: linux
+    compiler: gcc
+  - os: linux
+    compiler: clang
+  - os: osx
 script:
-- make -C tests
-- make -C tests pedantic
-- make -C tests pedantic EXTRA_CFLAGS=-DNO_DECLTYPE
-- make -C tests cplusplus
-- make -C tests cplusplus EXTRA_CFLAGS=-DNO_DECLTYPE
+- make -C tests EXTRA_CFLAGS="-W -Wall -Wextra"
+- make -C tests clean ; make -C tests pedantic
+- make -C tests clean ; make -C tests pedantic EXTRA_CFLAGS=-DNO_DECLTYPE
+- make -C tests clean ; make -C tests cplusplus
+- make -C tests clean ; make -C tests cplusplus EXTRA_CFLAGS=-DNO_DECLTYPE

+ 4 - 4
tests/Makefile

@@ -71,15 +71,15 @@ pedantic:
 	$(MAKE) all HASH_PEDANTIC=1
 
 cplusplus:
-	CC=$(CXX) $(MAKE) all
+	CC="$(CXX) -x c++" $(MAKE) all
 
 thorough:
 	$(MAKE) clean && $(MAKE) all EXTRA_CFLAGS='-pedantic'
 	$(MAKE) clean && $(MAKE) all EXTRA_CFLAGS='-pedantic -DHASH_BLOOM=16'
 	$(MAKE) clean && $(MAKE) tests_only EXTRA_CFLAGS='-pedantic -DHASH_BLOOM=16 -DHASH_DEBUG -DNO_DECLTYPE'
-	$(MAKE) clean && CC=$(CXX) $(MAKE) all EXTRA_CFLAGS='-pedantic'
-	$(MAKE) clean && CC=$(CXX) $(MAKE) all EXTRA_CFLAGS='-pedantic -DHASH_BLOOM=16'
-	$(MAKE) clean && CC=$(CXX) $(MAKE) tests_only EXTRA_CFLAGS='-pedantic -DHASH_BLOOM=16 -DHASH_DEBUG -DNO_DECLTYPE'
+	$(MAKE) clean && CC="$(CXX) -x c++" $(MAKE) all EXTRA_CFLAGS='-pedantic'
+	$(MAKE) clean && CC="$(CXX) -x c++" $(MAKE) all EXTRA_CFLAGS='-pedantic -DHASH_BLOOM=16'
+	$(MAKE) clean && CC="$(CXX) -x c++" $(MAKE) tests_only EXTRA_CFLAGS='-pedantic -DHASH_BLOOM=16 -DHASH_DEBUG -DNO_DECLTYPE'
 
 example: example.c $(HASHDIR)/uthash.h
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(@).c