Allow Travis failure on OSX, try Coverity again

.travis.yml

@@ -13,11 +13,11 @@ install:
     - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake/travis_install_mac.sh; fi
 
 script:
-    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake/travis_script_linux.sh; fi
-    - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake/travis_script_mac.sh; fi
+    - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake/travis_script_linux.sh; fi; fi
+    - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake/travis_script_mac.sh; fi; fi
 
 after_success:
-    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake/travis_after_success_linux.sh; fi
+    - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake/travis_after_success_linux.sh; fi; fi
 
 notifications:
     email:
@@ -35,6 +35,10 @@ os:
     - linux
     - osx
 
+matrix:
+    allow_failures:
+        - os: osx
+
 env:
     global:
         # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
@@ -47,7 +51,7 @@ addons:
             name: "xythobuz/OpenRaider"
             description: "Build submitted via Travis CI"
         notification_email: taucher.bodensee@googlemail.com
-        build_command_prepend: "cmake; make clean"
+        build_command_prepend: "cmake .; make clean"
         build_command:   "make -j 4"
         branch_pattern: coverity_scan
 

test/Script.cpp

@@ -102,6 +102,7 @@ namespace {
 }
 
 int main(int argc, char *argv[]) {
+    std::cout << "Tomb Raider 2:" << std::endl;
     char *f = fullPath("~/.OpenRaider/paks/tr2/TOMBPC.DAT", 0);
     int error = test(f, !((argc > 1) && (argv[1][0] == 's')));
     delete [] f;
@@ -109,10 +110,19 @@ int main(int argc, char *argv[]) {
     if (error != 0)
         return error;
 
+    std::cout << std::endl << "Tomb Raider 3:" << std::endl;
     f = fullPath("~/.OpenRaider/paks/tr3/TOMBPC.DAT", 0);
     error = test(f, !((argc > 1) && (argv[1][0] == 's')));
     delete [] f;
 
+    if (error != 0)
+        return error;
+
+    std::cout << std::endl << "Tomb Raider 2 PSX:" << std::endl;
+    f = fullPath("~/.OpenRaider/paks/tr2_psx/TOMBPSX.DAT", 0);
+    error = test(f, !((argc > 1) && (argv[1][0] == 's')));
+    delete [] f;
+
     return error;
 }