From 33ff2744ce23066039f9931111bfbf20d2b532f8 Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Sat, 23 Aug 2014 22:44:49 -0700 Subject: [PATCH] Making alloy-test run on travis (in theory). --- .travis.yml | 7 +++++-- test/run-tests.sh | 0 tools/alloy-sandbox/alloy-sandbox.gypi | 1 - tools/alloy-test/alloy-test.gypi | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) mode change 100644 => 100755 test/run-tests.sh diff --git a/.travis.yml b/.travis.yml index 5bc48c98d..109710b3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,10 @@ os: # Run setup to build ninja/gyp/etc and actually build xenia. before_script: - travis_retry ./xenia-build.py setup - - ./xenia-build.py build --debug + #- ./xenia-build.py build --debug + - ./third_party/ninja/ninja -C build/xenia/Debug alloy-test # Run test suite. -script: ./test/run-tests.sh +script: + - ./build/xenia/Debug/alloy-test + #- ./test/run-tests.sh diff --git a/test/run-tests.sh b/test/run-tests.sh old mode 100644 new mode 100755 diff --git a/tools/alloy-sandbox/alloy-sandbox.gypi b/tools/alloy-sandbox/alloy-sandbox.gypi index 7988e708f..e5b947eac 100644 --- a/tools/alloy-sandbox/alloy-sandbox.gypi +++ b/tools/alloy-sandbox/alloy-sandbox.gypi @@ -13,7 +13,6 @@ 'dependencies': [ 'alloy', - 'xenia', ], 'include_dirs': [ diff --git a/tools/alloy-test/alloy-test.gypi b/tools/alloy-test/alloy-test.gypi index 122f5b430..560886289 100644 --- a/tools/alloy-test/alloy-test.gypi +++ b/tools/alloy-test/alloy-test.gypi @@ -13,7 +13,6 @@ 'dependencies': [ 'alloy', - 'xenia', ], 'include_dirs': [