Fix CI scripts.

.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 ..

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
 

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