Changeset 14091

Timestamp:

Nov 18, 2019 8:12:09 AM (4 weeks ago)

Author:

randersson

Message:

#5819 [ci skip] Merged r14082-r14086 from branch to trunk containing minor changes in order to have assimulo build being able to run tests again

Location:

trunk

Files:

• . (modified) (1 prop)
• external/build_externals/Jenkins/ci/vars/buildAssimulo.groovy (modified) (1 diff)
• external/build_externals/Jenkins/ci/vars/buildAssimuloDocker.groovy (modified) (1 diff)
• external/build_externals/build/assimulo/makefile (modified) (1 diff)

trunk/external/build_externals/Jenkins/ci/vars/buildAssimulo.groovy

@@ -34 +34 @@
             make ${TARGET} USER_CONFIG=${USER_CONFIG}${bit} JM_HOME=\${JM_HOME} BUILD_DIR=\${JENKINS_BUILD_DIR} WORKSPACE=\${JM_HOME}/.. INSTALL_DIR_FOLDER=${INSTALL_PATH_UNIX}/${bit}${msvs_suffix}
             """, extra_bat);
-            if ("${TARGET}" == "folder") {
+            if ("${TARGET}" == "install") {
                 runMSYSWithEnv("""\
                 export JM_HOME="\$(pwd)/JModelica/"
-                nosetests ${INSTALL_PATH_UNIX}/assimulo/tests/*.py
+                nosetests ${INSTALL_PATH_UNIX}/${bit}${msvs_suffix}/assimulo/tests/*.py
                 """, "", false, bit); 
             }

trunk/external/build_externals/Jenkins/ci/vars/buildAssimuloDocker.groovy

@@ -14 +14 @@
                     sh "rm ${ARTIFACT_FILE}"
                 }
-                //sh "make docker_test_${TARGET} ${MAKE_ARGS}"
+                sh "make docker_test_${TARGET} ${MAKE_ARGS}"
             } finally {
                 sh "make clean_in_docker ${MAKE_ARGS}"

trunk/external/build_externals/build/assimulo/makefile

@@ -8 +8 @@
     nosetests tests/*.pyc tests/solvers/*.pyc
 
-test_wheel: $(INSTALL_DIR_FOLDER)/$(subst test_,,$@)
-    @pip install $(INSTALL_DIR_FOLDER)/$(subst test_,,$@)/*.whl
+test_wheel:
+    @cd $(JM_HOME)/$(DISTRO)/$(TARGET)$(BITNESS)/$(subst test_,,$@) && pip install *.whl
     nosetests $(WHEEL_INSTALL_DIR)/tests/*.pyc $(WHEEL_INSTALL_DIR)/tests/solvers/*.pyc
 
-test_folder: $(INSTALL_DIR_FOLDER)/$(subst test_,,$@)
+test_folder:
     nosetests $(ASSIMULO_FOLDER_INSTALL_DIR)/tests/*.pyc $(ASSIMULO_FOLDER_INSTALL_DIR)/tests/solvers/*.pyc