Changeset 21922

Timestamp:

08/09/17 14:16:52 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: install GSL first, and them emstruc truc, and removed some tests from windows

Location:

issm/trunk-jpl/jenkins

Files:

• linux64_ross_javascript (modified) (1 diff)
• windows (modified) (1 diff)

issm/trunk-jpl/jenkins/linux64_ross_javascript

@@ -24 +24 @@
 
 #List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="emscripten      install.sh        
-                                                gsl                       install-javascript.sh    
+EXTERNALPACKAGES="gsl                     install-javascript.sh    
                                                 triangle      install-javascript.sh        
-                                                shell2junit   install.sh"
+                                                shell2junit   install.sh
+                                                emscripten        install.sh"
 
 #-----------------#

issm/trunk-jpl/jenkins/windows

@@ -60 +60 @@
 
 #In Windows, we don't yet have MUMPS, can't do full stokes, so exclude all FS runs. Also exclude all runs with Dakota. And exclude higher order runs that have penalties. And 800+ tests because we don't want to have --with-development since we do the binaries with this version
-MATLAB_NROPTIONS="'exclude',[104,119, 124,125,126, 204, 211, 215, 220, 221, 285, 290, 308, 322, 404, 421, 422, 503, 507, 510, 511, 513, 701, 702, 703, 218, 234, 235, 250, 251, 412, 413, 414, 417, 418, 420, 440,444, 205, 274, 331, 405, 409, 455, 612, 514, 435, 280,801,802,803,804,805,291,340,341,460,243]"
+MATLAB_NROPTIONS="'exclude',[104,119, 124,125,126, 204, 211, 215, 220, 221, 285, 290, 308, 322, 404, 421, 422, 503, 507, 510, 511, 513, 701, 702, 703, 218, 234, 235, 250, 251, 412, 413, 414, 417, 418, 420, 440,444, 205, 274, 331, 405, 409, 455, 612, 514, 435, 280,801,802,803,804,805,291,340,341,460,243,430,441,442]"
 PYTHON_NROPTIONS=""