source: issm/oecreview/Archive/27032-27229/ISSM-27147-27148.diff@ 27230

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

CHG: oecreview
File size: 12.8 KB
RevLine 
[27230]1Index: ../trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh
2===================================================================
3--- ../trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh (revision 27147)
4+++ ../trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh (revision 27148)
5@@ -144,7 +144,7 @@
6 ${MATLAB_PATH}/bin/matlab -nojvm -nosplash -nojvm -r "try, addpath ${ISSM_DIR}/bin ${ISSM_DIR}/lib ${ISSM_DIR}/share; 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 -c -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword" matlab.log`
11
12 if [ ${matlabExitedInError} -ne 0 ]; then
13 echo "----------MATLAB exited in error!----------"
14@@ -158,10 +158,12 @@
15 fi
16
17 # Check that all tests passed
18- numTestsFailed=`grep -E "FAILED|ERROR" matlab.log | wc -l`
19+ sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" matlab.log # First, need to remove WindowServer error message
20+ numTestsFailed=`grep -c -E "FAILED|ERROR" matlab.log`
21
22 if [ ${numTestsFailed} -ne 0 ]; then
23 echo "One or more tests FAILED"
24+ cat matlab.log
25 exit 1
26 else
27 echo "All tests PASSED"
28@@ -174,7 +176,7 @@
29 cd ${ISSM_DIR}
30 svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
31 echo "Copying assets to package: ${PKG}"
32-cp -rf bin examples lib scripts test ${PKG}
33+cp -rf bin examples lib scripts share test ${PKG}
34 mkdir ${PKG}/execution
35 cp packagers/mac/issm-executable_entitlements.plist ${PKG}/bin/entitlements.plist
36 echo "Cleaning up unneeded/unwanted files"
37Index: ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-2.sh
38===================================================================
39--- ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-2.sh (revision 27147)
40+++ ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-2.sh (revision 27148)
41@@ -142,7 +142,7 @@
42
43 # Check that Python did not exit in error
44 pythonExitCode=`echo $?`
45- pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python.log | wc -l`
46+ pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter" python.log`
47
48 if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
49 echo "----------Python exited in error!----------"
50@@ -156,10 +156,12 @@
51 fi
52
53 # Check that all tests passed
54- numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
55+ sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" python.log # First, need to remove WindowServer error message
56+ numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
57
58 if [ ${numTestsFailed} -ne 0 ]; then
59 echo "One or more tests FAILED"
60+ cat python.log
61 exit 1
62 else
63 echo "All tests PASSED"
64@@ -172,7 +174,7 @@
65 cd ${ISSM_DIR}
66 svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
67 echo "Copying assets to package: ${PKG}"
68-cp -rf bin examples lib scripts test ${PKG}
69+cp -rf bin examples lib scripts share test ${PKG}
70 mkdir ${PKG}/execution
71 cp packagers/mac/issm-executable_entitlements.plist ${PKG}/bin/entitlements.plist
72 ${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files
73Index: ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh
74===================================================================
75--- ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh (revision 27147)
76+++ ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh (revision 27148)
77@@ -145,7 +145,7 @@
78
79 # Check that Python did not exit in error
80 pythonExitCode=`echo $?`
81- pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python.log | wc -l`
82+ pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter" python.log`
83
84 if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
85 echo "----------Python exited in error!----------"
86@@ -159,10 +159,12 @@
87 fi
88
89 # Check that all tests passed
90- numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
91+ sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" python.log # First, need to remove WindowServer error message
92+ numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
93
94 if [ ${numTestsFailed} -ne 0 ]; then
95 echo "One or more tests FAILED"
96+ cat python.log
97 exit 1
98 else
99 echo "All tests PASSED"
100@@ -175,7 +177,7 @@
101 cd ${ISSM_DIR}
102 svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
103 echo "Copying assets to package: ${PKG}"
104-cp -rf bin examples lib scripts test ${PKG}
105+cp -rf bin examples lib scripts share test ${PKG}
106 mkdir ${PKG}/execution
107 cp packagers/mac/issm-executable_entitlements.plist ${PKG}/bin/entitlements.plist
108 ${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files
109Index: ../trunk-jpl/packagers/mac/test-issm-mac-binaries-matlab.sh
110===================================================================
111--- ../trunk-jpl/packagers/mac/test-issm-mac-binaries-matlab.sh (revision 27147)
112+++ ../trunk-jpl/packagers/mac/test-issm-mac-binaries-matlab.sh (revision 27148)
113@@ -33,7 +33,7 @@
114
115 # Check that MATLAB did not exit in error
116 matlabExitCode=`echo $?`
117-matlabExitedInError=`grep -E "Activation cannot proceed|license|Error|Warning: Name is nonexistent or not a directory" matlab.log | wc -l`
118+matlabExitedInError=`grep -c -E "Activation cannot proceed|license|Error|Warning: Name is nonexistent or not a directory" matlab.log`
119
120 if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then
121 echo "----------MATLAB exited in error!----------"
122@@ -44,7 +44,7 @@
123 fi
124
125 # Check that all tests passed
126-numTestsFailed=`cat matlab.log | grep -c -e "FAILED|ERROR"`
127+numTestsFailed=`grep -c -E "FAILED|ERROR" matlab.log`
128
129 if [[ ${numTestsFailed} -ne 0 ]]; then
130 echo "One or more tests FAILED"
131Index: ../trunk-jpl/packagers/mac/test-issm-mac-binaries-python-2.sh
132===================================================================
133--- ../trunk-jpl/packagers/mac/test-issm-mac-binaries-python-2.sh (revision 27147)
134+++ ../trunk-jpl/packagers/mac/test-issm-mac-binaries-python-2.sh (revision 27148)
135@@ -33,7 +33,7 @@
136
137 # Check that Python did not exit in error
138 pythonExitCode=`echo $?`
139-pythonExitedInError=`grep -E "runme.py: error" python.log | wc -l`
140+pythonExitedInError=`grep -c -E "runme.py: error" python.log`
141
142 if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
143 echo "----------Python exited in error!----------"
144@@ -43,7 +43,7 @@
145 fi
146
147 # Check that all tests passed
148-numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
149+numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
150
151 if [[ ${numTestsFailed} -ne 0 ]]; then
152 echo "One or more tests FAILED"
153Index: ../trunk-jpl/packagers/mac/test-issm-mac-binaries-python-3.sh
154===================================================================
155--- ../trunk-jpl/packagers/mac/test-issm-mac-binaries-python-3.sh (revision 27147)
156+++ ../trunk-jpl/packagers/mac/test-issm-mac-binaries-python-3.sh (revision 27148)
157@@ -33,7 +33,7 @@
158
159 # Check that Python did not exit in error
160 pythonExitCode=`echo $?`
161-pythonExitedInError=`grep -E "runme.py: error" python.log | wc -l`
162+pythonExitedInError=`grep -c -E "runme.py: error" python.log`
163
164 if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
165 echo "----------Python exited in error!----------"
166@@ -43,7 +43,7 @@
167 fi
168
169 # Check that all tests passed
170-numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
171+numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
172
173 if [[ ${numTestsFailed} -ne 0 ]]; then
174 echo "One or more tests FAILED"
175Index: ../trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh
176===================================================================
177--- ../trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh (revision 27147)
178+++ ../trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh (revision 27148)
179@@ -130,7 +130,7 @@
180 ${MATLAB_PATH}/bin/matlab -nojvm -nosplash -nojvm -r "try, addpath ${ISSM_DIR}/bin ${ISSM_DIR}/lib ${ISSM_DIR}/share; runme(${MATLAB_NROPTIONS}); exit; catch me,fprintf('%s',getReport(me)); exit; end" &> matlab.log
181
182 # Check that MATLAB did not exit in error
183- matlabExitedInError=`grep -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword|Invalid MEX-file" matlab.log | wc -l`
184+ matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword|Invalid MEX-file" matlab.log`
185
186 if [ ${matlabExitedInError} -ne 0 ]; then
187 echo "----------MATLAB exited in error!----------"
188@@ -144,7 +144,8 @@
189 fi
190
191 # Check that all tests passed
192- numTestsFailed=`grep -E "FAILED|ERROR" matlab.log | wc -l`
193+ sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" matlab.log # First, need to remove WindowServer error message
194+ numTestsFailed=`grep -c -E "FAILED|ERROR" matlab.log`
195
196 if [ ${numTestsFailed} -ne 0 ]; then
197 echo "One or more tests FAILED"
198@@ -161,7 +162,7 @@
199 cd ${ISSM_DIR}
200 svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
201 echo "Copying assets to package: ${PKG}"
202-cp -rf bin examples lib scripts test ${PKG}
203+cp -rf bin examples lib scripts share test ${PKG}
204 mkdir ${PKG}/execution
205 echo "Cleaning up unneeded/unwanted files"
206 rm -f ${PKG}/bin/generic_static.* # Remove static versions of generic cluster classes
207Index: ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh
208===================================================================
209--- ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh (revision 27147)
210+++ ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh (revision 27148)
211@@ -129,7 +129,7 @@
212
213 # Check that Python did not exit in error
214 pythonExitCode=`echo $?`
215- pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python.log | wc -l`
216+ pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter" python.log`
217
218 if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
219 echo "----------Python exited in error!----------"
220@@ -143,11 +143,12 @@
221 fi
222
223 # Check that all tests passed
224- numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
225+ sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" python.log # First, need to remove WindowServer error message
226+ numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
227
228 if [[ ${numTestsFailed} -ne 0 ]]; then
229- echo "One or more tests FAILED"
230- cat python.log
231+ echo "One or more tests FAILED"
232+ cat python.log
233 exit 1
234 else
235 echo "All tests PASSED"
236@@ -160,7 +161,7 @@
237 cd ${ISSM_DIR}
238 svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
239 echo "Copying assets to package: ${PKG}"
240-cp -rf bin examples lib scripts test ${PKG}
241+cp -rf bin examples lib scripts share test ${PKG}
242 mkdir ${PKG}/execution
243 ${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files
244 echo "Cleaning up unneeded/unwanted files"
245Index: ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh
246===================================================================
247--- ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh (revision 27147)
248+++ ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh (revision 27148)
249@@ -132,7 +132,7 @@
250
251 # Check that Python did not exit in error
252 pythonExitCode=`echo $?`
253- pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python.log | wc -l`
254+ pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter" python.log`
255
256 if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
257 echo "----------Python exited in error!----------"
258@@ -146,7 +146,8 @@
259 fi
260
261 # Check that all tests passed
262- numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
263+ sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" python.log # First, need to remove WindowServer error message
264+ numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
265
266 if [[ ${numTestsFailed} -ne 0 ]]; then
267 echo "One or more tests FAILED"
268@@ -163,7 +164,7 @@
269 cd ${ISSM_DIR}
270 svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
271 echo "Copying assets to package: ${PKG}"
272-cp -rf bin examples lib scripts test ${PKG}
273+cp -rf bin examples lib scripts share test ${PKG}
274 mkdir ${PKG}/execution
275 ${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files
276 echo "Cleaning up unneeded/unwanted files"
Note: See TracBrowser for help on using the repository browser.