From 90d33c33c02359b3a545664cd60eae84d04788a2 Mon Sep 17 00:00:00 2001
From: Syoyo Fujita <syoyo@lighttransport.com>
Date: Mon, 18 Apr 2016 17:59:17 +0900
Subject: [PATCH] Fix CI scripts.

---
 .travis.yml    | 11 ++---------
 tests/Makefile |  5 ++++-
 wercker.yml    |  6 ++----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bde52f6..3ec9e45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,15 +42,8 @@ before_install:
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade; fi
 - if [ -n "$REPORT_COVERAGE" ]; then pip install --user cpp-coveralls; fi
 script:
-- mkdir build && cd build
-- export CC="${CC}-${COMPILER_VERSION}"
-- export CXX="${CXX}-${COMPILER_VERSION}"
-- ${CC} -v
-- cmake --version
-- cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DTINYOBJLOADER_BUILD_TEST_LOADER=On -G Ninja
-  ..
-- ninja
-- ./test_loader ../cornell_box.obj
+- cd tests
+- make check
 - if [ -n "$REPORT_COVERAGE" ]; then coveralls -b . -r .. -e examples -e tools -e
   jni -e python -e images -E ".*CompilerId.*" -E ".*feature_tests.*" ; fi
 - cd ..
diff --git a/tests/Makefile b/tests/Makefile
index 1a1434a..4a18c71 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,7 +1,10 @@
 .PHONY: clean
 
+CXX ?= g++
+CXXFLAGS ?= -g -O2
+
 tester: tester.cc
-	g++ -g -O0 -o tester tester.cc
+	$(CXX) $(CXXFLAGS) -o tester tester.cc
 
 all: tester
 
diff --git a/wercker.yml b/wercker.yml
index 3c1583c..1d1aa26 100644
--- a/wercker.yml
+++ b/wercker.yml
@@ -6,7 +6,5 @@ build:
             name: build
             code: |
                   git clone https://github.com/syoyo/orebuildenv.git
-                  chmod +x ./orebuildenv/build/linux/bin/premake4
-                  ./orebuildenv/build/linux/bin/premake4 gmake
-                  make
-                  ./test_tinyobjloader
+                  cd tests
+                  make check