Browse Source

Allow Travis failure on OSX, try Coverity again

Thomas Buck 9 years ago
parent
commit
6efb5b8954
2 changed files with 18 additions and 4 deletions
  1. 8
    4
      .travis.yml
  2. 10
    0
      test/Script.cpp

+ 8
- 4
.travis.yml View File

13
     - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake/travis_install_mac.sh; fi
13
     - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake/travis_install_mac.sh; fi
14
 
14
 
15
 script:
15
 script:
16
-    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake/travis_script_linux.sh; fi
17
-    - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake/travis_script_mac.sh; fi
16
+    - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake/travis_script_linux.sh; fi; fi
17
+    - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake/travis_script_mac.sh; fi; fi
18
 
18
 
19
 after_success:
19
 after_success:
20
-    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake/travis_after_success_linux.sh; fi
20
+    - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake/travis_after_success_linux.sh; fi; fi
21
 
21
 
22
 notifications:
22
 notifications:
23
     email:
23
     email:
35
     - linux
35
     - linux
36
     - osx
36
     - osx
37
 
37
 
38
+matrix:
39
+    allow_failures:
40
+        - os: osx
41
+
38
 env:
42
 env:
39
     global:
43
     global:
40
         # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
44
         # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
47
             name: "xythobuz/OpenRaider"
51
             name: "xythobuz/OpenRaider"
48
             description: "Build submitted via Travis CI"
52
             description: "Build submitted via Travis CI"
49
         notification_email: taucher.bodensee@googlemail.com
53
         notification_email: taucher.bodensee@googlemail.com
50
-        build_command_prepend: "cmake; make clean"
54
+        build_command_prepend: "cmake .; make clean"
51
         build_command:   "make -j 4"
55
         build_command:   "make -j 4"
52
         branch_pattern: coverity_scan
56
         branch_pattern: coverity_scan
53
 
57
 

+ 10
- 0
test/Script.cpp View File

102
 }
102
 }
103
 
103
 
104
 int main(int argc, char *argv[]) {
104
 int main(int argc, char *argv[]) {
105
+    std::cout << "Tomb Raider 2:" << std::endl;
105
     char *f = fullPath("~/.OpenRaider/paks/tr2/TOMBPC.DAT", 0);
106
     char *f = fullPath("~/.OpenRaider/paks/tr2/TOMBPC.DAT", 0);
106
     int error = test(f, !((argc > 1) && (argv[1][0] == 's')));
107
     int error = test(f, !((argc > 1) && (argv[1][0] == 's')));
107
     delete [] f;
108
     delete [] f;
109
     if (error != 0)
110
     if (error != 0)
110
         return error;
111
         return error;
111
 
112
 
113
+    std::cout << std::endl << "Tomb Raider 3:" << std::endl;
112
     f = fullPath("~/.OpenRaider/paks/tr3/TOMBPC.DAT", 0);
114
     f = fullPath("~/.OpenRaider/paks/tr3/TOMBPC.DAT", 0);
113
     error = test(f, !((argc > 1) && (argv[1][0] == 's')));
115
     error = test(f, !((argc > 1) && (argv[1][0] == 's')));
114
     delete [] f;
116
     delete [] f;
115
 
117
 
118
+    if (error != 0)
119
+        return error;
120
+
121
+    std::cout << std::endl << "Tomb Raider 2 PSX:" << std::endl;
122
+    f = fullPath("~/.OpenRaider/paks/tr2_psx/TOMBPSX.DAT", 0);
123
+    error = test(f, !((argc > 1) && (argv[1][0] == 's')));
124
+    delete [] f;
125
+
116
     return error;
126
     return error;
117
 }
127
 }
118
 
128
 

Loading…
Cancel
Save