From 1253c6a218c6e455056906e72fe21e4e32aadc37 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 20 Nov 2016 21:51:09 +0100 Subject: [PATCH 1/2] Removed debut code --- test/gtc/gtc_packing.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/test/gtc/gtc_packing.cpp b/test/gtc/gtc_packing.cpp index b822a108..7d3aca9d 100644 --- a/test/gtc/gtc_packing.cpp +++ b/test/gtc/gtc_packing.cpp @@ -174,10 +174,6 @@ int test_Snorm3x10_1x2() glm::uint32 p1 = glm::packSnorm3x10_1x2(v0); glm::vec4 v1 = glm::unpackSnorm3x10_1x2(p1); - printf("Snorm3x10_1x2: p0: %x; v0: %3.2f, %3.2f, %3.2f, %3.2f; p1: %x; v1: %3.2f, %3.2f, %3.2f, %3.2f\n", - p0, v0.x, v0.y, v0.z, v0.w, - p1, v1.x, v1.y, v1.z, v1.w); - Error += glm::all(glm::epsilonEqual(v0, v1, 0.01f)) ? 0 : 1; } @@ -203,10 +199,6 @@ int test_Unorm3x10_1x2() glm::uint32 p1 = glm::packUnorm3x10_1x2(v0); glm::vec4 v1 = glm::unpackUnorm3x10_1x2(p1); - printf("Unorm3x10_1x2: p0: %x; v0: %3.2f, %3.2f, %3.2f, %3.2f; p1: %x; v1: %3.2f, %3.2f, %3.2f, %3.2f\n", - p0, v0.x, v0.y, v0.z, v0.w, - p1, v1.x, v1.y, v1.z, v1.w); - Error += glm::all(glm::epsilonEqual(v0, v1, 0.001f)) ? 0 : 1; } From 9b158c57b921a11c53dd39fa1466f590876b9876 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 20 Nov 2016 22:05:40 +0100 Subject: [PATCH 2/2] Added more continous integration system --- .appveyor.yml | 34 ++++++++++++++++++++++++++++++ .travis.yml | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 .appveyor.yml create mode 100644 .travis.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 00000000..2380bc72 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,34 @@ +clone_folder: c:\dev\glm-cmake + +os: + - Visual Studio 2013 + +platform: + - x86 + - x86_64 + +build_script: +- md build_pure_11 +- cd build_pure_11 +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_FORCE_PURE=ON .. +- cmake --build . --config Debug +- cmake --build . --config Release +- cd .. +- md build_simd_11 +- cd build_simd_11 +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON .. +- cmake --build . --config Debug +- cmake --build . --config Release +- cd .. +- md build_pure_98 +- cd build_pure_98 +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_FORCE_PURE=ON .. +- cmake --build . --config Debug +- cmake --build . --config Release +- cd .. +- md build_simd_98 +- cd build_simd_98 +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON .. +- cmake --build . --config Debug +- cmake --build . --config Release +- cd .. diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..7201db70 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,58 @@ +language: cpp + +matrix: + include: + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.9 + env: COMPILER=g++-4.9 + - compiler: clang + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.8 + packages: + - clang-3.8 + env: COMPILER=clang++-3.8 + +compiler: + - clang + +before_script: + +script: +- mkdir ./build_pure_11 +- cd ./build_pure_11 +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_FORCE_PURE=ON .. +- cmake --build . +- ctest +- cd .. +- mkdir ./build_simd_11 +- cd ./build_simd_11 +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON .. +- cmake --build . +- ctest +- cd .. +- mkdir ./build_pure_98 +- cd ./build_pure_98 +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_FORCE_PURE=ON .. +- cmake --build . +- ctest +- cd .. +- mkdir ./build_simd_98 +- cd ./build_simd_98 +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON .. +- cmake --build . +- ctest +- cd .. + + + + + +