source: issm/oecreview/Archive/27032-27229/ISSM-27063-27064.diff@ 27230

Last change on this file since 27230 was 27230, checked in by Mathieu Morlighem, 3 years ago

CHG: oecreview
File size: 5.0 KB
RevLine 
[27230]1Index: ../trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh
2===================================================================
3--- ../trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh (revision 27063)
4+++ ../trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh (revision 27064)
5@@ -121,7 +121,7 @@
6 ${MATLAB_PATH}/bin/matlab -nojvm -nosplash -nojvm -r "try, addpath ${ISSM_DIR}/bin ${ISSM_DIR}/lib; runme(${MATLAB_NROPTIONS}); exit; catch me,fprintf('%s',getReport(me)); exit; end" &> matlab.log
7
8 # Check that MATLAB did not exit in error
9- matlabExitedInError=`grep -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword" matlab.log | wc -l`
10+ matlabExitedInError=`grep -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword|Invalid MEX-file" matlab.log | wc -l`
11
12 if [ ${matlabExitedInError} -ne 0 ]; then
13 echo "----------MATLAB exited in error!----------"
14@@ -135,7 +135,7 @@
15 fi
16
17 # Check that all tests passed
18- numTestsFailed=`cat matlab.log | grep -c -e "FAILED|ERROR"`
19+ numTestsFailed=`grep -E "FAILED|ERROR" matlab.log | wc -l`
20
21 if [ ${numTestsFailed} -ne 0 ]; then
22 echo "One or more tests FAILED"
23Index: ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh
24===================================================================
25--- ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh (revision 27063)
26+++ ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh (revision 27064)
27@@ -135,7 +135,7 @@
28 fi
29
30 # Check that all tests passed
31- numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
32+ numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
33
34 if [[ ${numTestsFailed} -ne 0 ]]; then
35 echo "One or more tests FAILED"
36Index: ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh
37===================================================================
38--- ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh (revision 27063)
39+++ ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh (revision 27064)
40@@ -138,7 +138,7 @@
41 fi
42
43 # Check that all tests passed
44- numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
45+ numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
46
47 if [[ ${numTestsFailed} -ne 0 ]]; then
48 echo "One or more tests FAILED"
49Index: ../trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh
50===================================================================
51--- ../trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh (revision 27063)
52+++ ../trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh (revision 27064)
53@@ -149,7 +149,7 @@
54 fi
55
56 # Check that all tests passed
57- numTestsFailed=`cat matlab.log | grep -c -e "FAILED|ERROR"`
58+ numTestsFailed=`grep -E "FAILED|ERROR" matlab.log | wc -l`
59
60 if [ ${numTestsFailed} -ne 0 ]; then
61 echo "One or more tests FAILED"
62Index: ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-2.sh
63===================================================================
64--- ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-2.sh (revision 27063)
65+++ ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-2.sh (revision 27064)
66@@ -147,7 +147,7 @@
67 fi
68
69 # Check that all tests passed
70- numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
71+ numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
72
73 if [ ${numTestsFailed} -ne 0 ]; then
74 echo "One or more tests FAILED"
75Index: ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh
76===================================================================
77--- ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh (revision 27063)
78+++ ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh (revision 27064)
79@@ -150,7 +150,7 @@
80 fi
81
82 # Check that all tests passed
83- numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
84+ numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
85
86 if [ ${numTestsFailed} -ne 0 ]; then
87 echo "One or more tests FAILED"
88Index: ../trunk-jpl/src/wrappers/matlab/Makefile.am
89===================================================================
90--- ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 27063)
91+++ ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 27064)
92@@ -121,7 +121,7 @@
93 if MAC
94 AM_LDFLAGS += -Wl,-rpath,'@rpath'
95 else
96-AM_LDFLAGS += -Wl,-static -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN'
97+AM_LDFLAGS += -Wl,-static -Wl,-lbacktrace -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN'
98 endif
99 endif
100
101Index: ../trunk-jpl/src/wrappers/python/Makefile.am
102===================================================================
103--- ../trunk-jpl/src/wrappers/python/Makefile.am (revision 27063)
104+++ ../trunk-jpl/src/wrappers/python/Makefile.am (revision 27064)
105@@ -75,7 +75,7 @@
106 if MAC
107 AM_LDFLAGS += -Wl,-rpath,'@rpath'
108 else
109-AM_LDFLAGS += -Wl,-static -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN'
110+AM_LDFLAGS += -Wl,-static -Wl,-lbacktrace -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN'
111 endif
112 endif
113
Note: See TracBrowser for help on using the repository browser.