Changeset 14091


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk

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

    r14080 r14091  
    3434            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}
    3535            """, extra_bat);
    36             if ("${TARGET}" == "folder") {
     36            if ("${TARGET}" == "install") {
    3737                runMSYSWithEnv("""\
    3838                export JM_HOME="\$(pwd)/JModelica/"
    39                 nosetests ${INSTALL_PATH_UNIX}/assimulo/tests/*.py
     39                nosetests ${INSTALL_PATH_UNIX}/${bit}${msvs_suffix}/assimulo/tests/*.py
    4040                """, "", false, bit);
    4141            }
  • trunk/external/build_externals/Jenkins/ci/vars/buildAssimuloDocker.groovy

    r14056 r14091  
    1414                    sh "rm ${ARTIFACT_FILE}"
    1515                }
    16                 //sh "make docker_test_${TARGET} ${MAKE_ARGS}"
     16                sh "make docker_test_${TARGET} ${MAKE_ARGS}"
    1717            } finally {
    1818                sh "make clean_in_docker ${MAKE_ARGS}"
  • trunk/external/build_externals/build/assimulo/makefile

    r14056 r14091  
    88    nosetests tests/*.pyc tests/solvers/*.pyc
    99
    10 test_wheel: $(INSTALL_DIR_FOLDER)/$(subst test_,,$@)
    11     @pip install $(INSTALL_DIR_FOLDER)/$(subst test_,,$@)/*.whl
     10test_wheel:
     11    @cd $(JM_HOME)/$(DISTRO)/$(TARGET)$(BITNESS)/$(subst test_,,$@) && pip install *.whl
    1212    nosetests $(WHEEL_INSTALL_DIR)/tests/*.pyc $(WHEEL_INSTALL_DIR)/tests/solvers/*.pyc
    1313
    14 test_folder: $(INSTALL_DIR_FOLDER)/$(subst test_,,$@)
     14test_folder:
    1515    nosetests $(ASSIMULO_FOLDER_INSTALL_DIR)/tests/*.pyc $(ASSIMULO_FOLDER_INSTALL_DIR)/tests/solvers/*.pyc
    1616
Note: See TracChangeset for help on using the changeset viewer.