Changeset 13795


Ignore:
Timestamp:
Oct 22, 2019 9:11:47 AM (3 weeks ago)
Author:
aramle
Message:

#5819 Adding variable to be able to define Python base dir and updating assimulo test to work with Python 3.

Location:
branches/dev-5819/Python
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-5819/Python/Makefile.am

    r13792 r13795  
    1313    case $(build) in \
    1414    *-cygwin*) \
    15     cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_Fortran_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) -PYTHON_BASE_DIR=Python ;; \
     15    cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_Fortran_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) -DPYTHON_BASE_DIR=Python ;; \
    1616    *-mingw*) \
    17     cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_Fortran_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) -PYTHON_BASE_DIR=Python ;; \
     17    cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_Fortran_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) -DPYTHON_BASE_DIR=Python ;; \
    1818    *-apple*) \
    1919    cmake -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) ;; \
  • branches/dev-5819/Python/Makefile.in

    r13792 r13795  
    416416    case $(build) in \
    417417    *-cygwin*) \
    418     cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_Fortran_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) -PYTHON_BASE_DIR=Python ;; \
     418    cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_Fortran_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) -DPYTHON_BASE_DIR=Python ;; \
    419419    *-mingw*) \
    420     cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_Fortran_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) -PYTHON_BASE_DIR=Python ;; \
     420    cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_Fortran_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) -DPYTHON_BASE_DIR=Python ;; \
    421421    *-apple*) \
    422422    cmake -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) ;; \
  • branches/dev-5819/Python/src/tests_jmodelica/simulation/test_assimulo_interface_fmi.py

    r13794 r13795  
    2727from pyfmi.common.io import ResultDymolaTextual
    2828from tests_jmodelica import testattr, get_files_path
     29from pyfmi.common import python3_flag
    2930
    3031try:
     
    19291930        This tests a simulation with an event of terminate simulation.
    19301931        """
    1931         model = load_fmu('Robot.fmu', path_to_fmus_me1)
     1932        # Robot.fmu will not load with Python 3
     1933        if python3_flag:
     1934            model = load_fmu('RobotPy3.fmu', path_to_fmus_me1)
     1935        else:
     1936            model = load_fmu('Robot.fmu', path_to_fmus_me1)
    19321937       
    19331938        res = model.simulate(final_time=2.0)
Note: See TracChangeset for help on using the changeset viewer.