From e0104179ed4f9ff6d567156b63a3ac5cd0dc27ad Mon Sep 17 00:00:00 2001 From: jsalling Date: Wed, 18 Jan 2017 22:18:11 -0600 Subject: [PATCH] Fix 32-bit build issues on Travis-CI by installing multilib If, longer term, the Travis-CI support for 32-bit is inconsistent the lines that failed are: - make -s DEBUG=-m32 - cd ../example_3 && rake Add target 'ci' for building examples with -Werror --- .travis.yml | 7 ++++--- examples/example_1/makefile | 2 ++ examples/example_2/makefile | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b90fd42..edf25ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ matrix: before_install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then rvm install 2.1 && rvm use 2.1 && ruby -v; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install --assume-yes --quiet gcc-multilib; fi install: gem install rspec script: - cd test && rake ci @@ -19,6 +20,6 @@ script: - cd ../extras/fixture/test && rake ci - make -s default noStdlibMalloc - make -s C89 - - cd ../../../examples/example_1 && make -s - - cd ../example_2 && make -s - - cd ../example_3 && rake \ No newline at end of file + - cd ../../../examples/example_1 && make -s ci + - cd ../example_2 && make -s ci + - cd ../example_3 && rake diff --git a/examples/example_1/makefile b/examples/example_1/makefile index c5a3ca4..cca79b4 100644 --- a/examples/example_1/makefile +++ b/examples/example_1/makefile @@ -67,3 +67,5 @@ test/test_runners/TestProductionCode2_Runner.c: test/TestProductionCode2.c clean: $(CLEANUP) $(TARGET1) $(TARGET2) +ci: CFLAGS += -Werror +ci: default diff --git a/examples/example_2/makefile b/examples/example_2/makefile index cfde2cc..99d8d96 100644 --- a/examples/example_2/makefile +++ b/examples/example_2/makefile @@ -66,3 +66,5 @@ default: clean: $(CLEANUP) $(TARGET1) +ci: CFLAGS += -Werror +ci: default