Test cross-compiled mingw64 and msvc64 (#855)

All PRs will be tested on Windows with mingw and msvc.

Updating test FMUs in testsuite
  - Updated mos scripts to use docker image for test FMU export
  - Updated Makefile for generating FMUs to clean up more
  - Updated FMUs for linux64 compiled with Bionic Docker image using omc version
    OMCompiler v1.17.0-dev.166+g6ef71eea6b.
  - Added cross-compiled win64 FMUs for mingw with Docker using omc version
    OMCompiler v1.17.0-dev.166+g6ef71eea6b.
  - Updated .gitignore to ignore created test files

Co-authored-by: Andreas Heuermann <andreas.heuermann@liu.se>

Author: lochel

Jenkinsfile

@@ -231,13 +231,11 @@ pipeline {
                 ! ls install/linux/bin/*.so 1> /dev/null 2>&1
                 (cd install/linux && tar czf "../../OMSimulator-linux-arm32-`git describe --tags --abbrev=7 --match=v*.* --exclude=*-dev | sed \'s/-/.post/\'`.tar.gz" *)
                 '''
-
                 archiveArtifacts "OMSimulator-linux-arm32-*.tar.gz"
                 stash name: 'arm32-zip', includes: "OMSimulator-linux-arm32-*.tar.gz"
                 stash name: 'arm32-install', includes: "install/linux/**"
               }
             }
-
             stage('test') {
               /* when {
                 beforeAgent true
@@ -308,7 +306,6 @@ pipeline {
                 stash name: 'osx-install', includes: "install/mac/**"
               }
             }
-
             stage('test') {
               /* when {
                 beforeAgent true
@@ -327,36 +324,79 @@ pipeline {
             }
           }
         }
+
         stage('mingw64-cross') {
-          agent {
-            docker {
-              image 'docker.openmodelica.org/msyscross-omsimulator:v2.0'
-              label 'linux'
-              alwaysPull true
+          stages {
+            stage('cross-compile') {
+              agent {
+                docker {
+                  image 'docker.openmodelica.org/msyscross-omsimulator:v2.0'
+                  label 'linux'
+                  alwaysPull true
+                }
+              }
+              environment {
+                CROSS_TRIPLE = "x86_64-w64-mingw32"
+                CC = "${env.CROSS_TRIPLE}-gcc-posix"
+                CXX = "${env.CROSS_TRIPLE}-g++-posix"
+                CPPFLAGS = '-I/opt/pacman/mingw64/include'
+                LDFLAGS = '-L/opt/pacman/mingw64/lib'
+                AR = "${env.CROSS_TRIPLE}-ar-posix"
+                RANLIB = "${env.CROSS_TRIPLE}-ranlib-posix"
+                detected_OS = 'MINGW64'
+                VERBOSE = '1'
+                BOOST_ROOT = '/opt/pacman/mingw64/'
+              }
+              steps {
+                buildOMS()
+                sh '''
+                (cd install/mingw && zip -r "../../OMSimulator-mingw64-`git describe --tags --abbrev=7 --match=v*.* --exclude=*-dev | sed \'s/-/.post/\'`.zip" *)
+                '''
+                archiveArtifacts "OMSimulator-mingw64*.zip"
+                stash name: 'mingw64-zip', includes: "OMSimulator-mingw64-*.zip"
+                stash name: 'mingw64-install', includes: "install/mingw/**"
+              }
             }
-          }
-          environment {
-            CROSS_TRIPLE = "x86_64-w64-mingw32"
-            CC = "${env.CROSS_TRIPLE}-gcc-posix"
-            CXX = "${env.CROSS_TRIPLE}-g++-posix"
-            CPPFLAGS = '-I/opt/pacman/mingw64/include'
-            LDFLAGS = '-L/opt/pacman/mingw64/lib'
-            AR = "${env.CROSS_TRIPLE}-ar-posix"
-            RANLIB = "${env.CROSS_TRIPLE}-ranlib-posix"
-            detected_OS = 'MINGW64'
-            VERBOSE = '1'
-            BOOST_ROOT = '/opt/pacman/mingw64/'
-          }
+            stage('test') {
+              agent {
+                label 'omsimulator-windows'
+              }
+              environment {
+                PATH = "${env.PATH};C:\\bin\\git\\bin;C:\\bin\\git\\usr\\bin;C:\\OMDev\\tools\\msys\\mingw64\\bin\\"
+                OMDEV = "/c/OMDev"
+                MSYSTEM = "MINGW64"
+                RUNTESTDB="${env.HOME}/jenkins-cache/runtest/"
+              }
+              steps {
+                unstash name: 'mingw64-install'
 
-          steps {
-            buildOMS()
-            sh '''
-            (cd install/mingw && zip -r "../../OMSimulator-mingw64-`git describe --tags --abbrev=7 --match=v*.* --exclude=*-dev | sed \'s/-/.post/\'`.zip" *)
-            '''
+                bat 'hostname'
+                writeFile file: "testMingw64-install.sh", text:"""#!/bin/sh
+set -x -e
+cd "${env.WORKSPACE}"
+export PATH="/c/Program Files/TortoiseSVN/bin/:/c/bin/jdk/bin:/c/bin/nsis/:\$PATH:/c/bin/git/bin"
+make -C testsuite difftool resources
+cp -f "${env.RUNTESTDB}/"* testsuite/ || true
+find testsuite/ -name "*.lua" -exec sed -i /teardown_command/d {} ";"
+cd testsuite/partest
+./runtests.pl -j\$(nproc) -nocolour ${env.BRANCH_NAME == "master" ? "-notlm" : ""} -with-xml ${params.RUNTESTS_FLAG}
+"""
+                bat """
+set BOOST_ROOT=C:\\local\\boost_1_64_0
+set PATH=C:\\bin\\cmake\\bin;%PATH%
+
+C:\\OMDev\\tools\\msys\\usr\\bin\\sh --login -i '${env.WORKSPACE}/testMingw64-install.sh'
 
-            archiveArtifacts "OMSimulator-mingw64-*.zip"
-            stash name: 'mingw64-zip', includes: "OMSimulator-mingw64-*.zip"
-            stash name: 'mingw64-install', includes: "install/mingw/**"
+EXIT /b 0
+
+:fail
+ECHO Something went wrong!
+EXIT /b 1
+"""
+
+                junit 'testsuite/partest/result.xml'
+              }
+            }
           }
         }
 
@@ -402,29 +442,30 @@ pipeline {
         }
 
         stage('msvc64') {
-          when {
-            expression { return params.MSVC64 }
-            beforeAgent true
-          }
-          agent {
-            label 'omsimulator-windows'
-          }
-          environment {
-            PATH = "${env.PATH};C:\\bin\\git\\bin;C:\\bin\\git\\usr\\bin;C:\\OMDev\\tools\\msys\\mingw64\\bin\\"
-            OMDEV = "/c/OMDev"
-            MSYSTEM = "MINGW64"
-          }
-
-          steps {
-            bat 'hostname'
-            writeFile file: "buildZip.sh", text: """#!/bin/sh
+          stages {
+            stage('build') {
+              when {
+                expression { return params.MSVC64 }
+                beforeAgent true
+              }
+              agent {
+                label 'omsimulator-windows'
+              }
+              environment {
+                PATH = "${env.PATH};C:\\bin\\git\\bin;C:\\bin\\git\\usr\\bin;C:\\OMDev\\tools\\msys\\mingw64\\bin\\"
+                OMDEV = "/c/OMDev"
+                MSYSTEM = "MINGW64"
+              }
+              steps {
+                bat 'hostname'
+                writeFile file: "buildZip.sh", text: """#!/bin/sh
 set -x -e
 export PATH="/c/Program Files/TortoiseSVN/bin/:/c/bin/jdk/bin:/c/bin/nsis/:\$PATH:/c/bin/git/bin"
 cd "${env.WORKSPACE}/install/win"
 zip -r "../../OMSimulator-win64-`git describe --tags --abbrev=7 --match=v*.* --exclude=*-dev | sed \'s/-/.post/\'`.zip" *
 """
 
-            retry(2) { bat """
+                retry(2) { bat """
 set BOOST_ROOT=C:\\local\\boost_1_64_0
 set PATH=C:\\bin\\cmake\\bin;%PATH%
 
@@ -446,8 +487,51 @@ ECHO Something went wrong!
 EXIT /b 1
 """ }
 
-            archiveArtifacts "OMSimulator-win64-*.zip"
-            stash name: 'win64-zip', includes: "OMSimulator-win64-*.zip"
+                archiveArtifacts "OMSimulator-win64-*.zip"
+                stash name: 'win64-zip', includes: "OMSimulator-win64-*.zip"
+                stash name: 'win64-install', includes: "install/win/**"
+              }
+            }
+            stage('test') {
+              agent {
+                label 'omsimulator-windows'
+              }
+              environment {
+                PATH = "${env.PATH};C:\\bin\\git\\bin;C:\\bin\\git\\usr\\bin;C:\\OMDev\\tools\\msys\\mingw64\\bin\\"
+                OMDEV = "/c/OMDev"
+                MSYSTEM = "MINGW64"
+                RUNTESTDB="${env.HOME}/jenkins-cache/runtest/"
+              }
+              steps {
+                unstash name: 'win64-install'
+
+                bat 'hostname'
+                writeFile file: "testMSVC64-install.sh", text:"""#!/bin/sh
+set -x -e
+cd "${env.WORKSPACE}"
+export PATH="/c/Program Files/TortoiseSVN/bin/:/c/bin/jdk/bin:/c/bin/nsis/:\$PATH:/c/bin/git/bin"
+make -C testsuite difftool resources
+cp -f "${env.RUNTESTDB}/"* testsuite/ || true
+find testsuite/ -name "*.lua" -exec sed -i /teardown_command/d {} ";"
+cd testsuite/partest
+./runtests.pl -j\$(nproc) -platform=win -nocolour ${env.BRANCH_NAME == "master" ? "-notlm" : ""} -with-xml ${params.RUNTESTS_FLAG}
+"""
+                bat """
+set BOOST_ROOT=C:\\local\\boost_1_64_0
+set PATH=C:\\bin\\cmake\\bin;%PATH%
+
+C:\\OMDev\\tools\\msys\\usr\\bin\\sh --login -i '${env.WORKSPACE}/testMSVC64-install.sh'
+
+EXIT /b 0
+
+:fail
+ECHO Something went wrong!
+EXIT /b 1
+"""
+
+                junit 'testsuite/partest/result.xml'
+              }
+            }
           }
         }
 

README.md

@@ -43,13 +43,13 @@ Note: Make sure to fetch the submodules, e.g., using `git submodule update --ini
 
 ### Linux / MacOS
 
-1. install libxml2-dev
+1. Install libxml2-dev
 
    ```bash
    sudo apt-get install libxml2-dev
    ```
 
-1. configure OMSimulator
+1. Configure OMSimulator
 
    ```bash
    make config-3rdParty
@@ -58,20 +58,20 @@ Note: Make sure to fetch the submodules, e.g., using `git submodule update --ini
 
    For the debug configuration add `BUILD_TYPE=Debug` to `make config-OMSimulator`.
 
-1. build OMSimulator
+1. Build OMSimulator
 
    ```bash
    make OMSimulator -j4
    ```
 
 ### Windows (OMDev mingw)
 
-1. setup OMDev
+1. Setup OMDev
 
    - Checkout OMDev (OpenModelica Development Environment): `git clone https://openmodelica.org/git/OMDev.git`
    - Follow the instructions in `OMDev/INSTALL.txt`
 
-1. configure OMSimulator
+1. Configure OMSimulator
 
    ```bash
    make config-3rdParty
@@ -80,7 +80,7 @@ Note: Make sure to fetch the submodules, e.g., using `git submodule update --ini
 
    For the debug configuration add `BUILD_TYPE=Debug` to `make config-OMSimulator`.
 
-1. build OMSimulator
+1. Build OMSimulator
 
    ```bash
    make OMSimulator -j4
@@ -97,22 +97,71 @@ The following versions of Visual Studio are supported:
 
 It is not strictly required to install the full Visual Studio IDE. The batch scripts only require *[Visual C++ Build Tools](http://landinghub.visualstudio.com/visual-cpp-build-tools)*.
 
-1. install boost (VS14: 1.63, VS15: 1.64)
+1. Install boost (VS14: 1.63, VS15: 1.64)
 
    - Download and install precompiled boost libs, e.g. from [this](https://sourceforge.net/projects/boost/files/boost-binaries/) source
    - Set environment variable `BOOST_ROOT` to install path, e.g:
      - `BOOST_ROOT=C:\local\boost_1_64_0`
 
-1. configure OMSimulator
+1. Configure OMSimulator
 
    ```bash
-   configWinVS.bat VS15-Win64
+   .\configWinVS.bat VS15-Win64
    ```
 
    To build the debug version change `CMAKE_BUILD_TYPE` to `Debug` or change the release type in Visual Studio to `debug`.
 
-1. build OMSimulator
+1. Build OMSimulator
 
    ```bash
-   buildWinVS.bat VS15-Win64
+   .\buildWinVS.bat VS15-Win64
    ```
+
+## Test your build
+
+The testsuite of OMSimulator is run on Jenkins for every commit and creating
+[test reports](https://test.openmodelica.org/jenkins/job/OMSimulator/job/master/lastSuccessfulBuild/testReport/).
+The project is tested for the following OS:
+   - linux-arm32
+   - linux64 without OMPython
+   - cross-compiled mingw64
+   - msvc64
+   - cross-compiled OSX
+
+In addition the [OpenModelica project](https://github.com/OpenModelica/OpenModelica) has a number of test cases using OMSimulator for FMU simulation that can be find in this [OpenModelica test reports](https://test.openmodelica.org/jenkins/job/OpenModelica/job/master/lastSuccessfulBuild/testReport/).
+
+To verify your build is compiled and installed corrrectly see the following instructions.
+
+### Linux / MacOS / Windows (OMDev mingw)
+
+1. Build test dependencies
+   ```bash
+   make -C testsuite/ difftool resources
+   ```
+
+2. Run partest
+
+   ```bash
+   cd testsuite/partest/
+   ./runtests.pl -j4
+   ```
+   Use `-jN` to test with `N` threads.
+   To disable TLM tests add `-notlm`, to disable Python tests add `-asan`.
+
+### Windows (Visual Studio)
+
+We currently have no bat-Script to build and test with CMD, so you have to use OMDev mingw shell for the tests.
+
+1. Build test dependencies
+   ```bash
+   make -C testsuite/ difftool resources
+   ```
+
+2. Run partest
+
+   ```bash
+   cd testsuite/partest/
+   ./runtests.pl -j4 -platform=win
+   ```
+   Use `-jN` to test with `N` threads.
+   To disable TLM tests add `-notlm`, to disable Python tests add `-asan`.

testsuite/AircraftVehicleDemonstrator/.gitignore

@@ -0,0 +1,2 @@
+/*.fail_log
+/*.test_log

testsuite/AircraftVehicleDemonstrator/AircraftVehicleDemonstrator.lua

@@ -1,8 +1,8 @@
 -- status: correct
 -- teardown_command: rm -rf AircraftVehicleDemonstrator_tmp/ AircraftVehicleDemonstrator.log AircraftVehicleDemonstrator*.dot AircraftVehicleDemonstrator_res.mat
 -- linux: no
--- mingw: yes
--- win: yes
+-- mingw: no
+-- win: no
 
 --oms_setLoggingLevel(0)
 oms_setCommandLineOption("--suppressPath=true")

testsuite/OMSimulator/.gitignore

@@ -0,0 +1,5 @@
+/*.fail_log
+/*.test_log
+/*.ssv
+/*.ssp
+/*.mat

testsuite/OMSimulator/PI_Controller.lua

@@ -1,7 +1,7 @@
 -- status: correct
 -- teardown_command: rm -rf PI_Controller-lua/ PI_Controller_init.dot PI_Controller_sim.dot PI_Controller_res.mat PI_Controller.ssp
 -- linux: yes
--- mingw: yes
+-- mingw: no
 -- win: no
 -- mac: no
 

testsuite/OMSimulator/deleteConnector.lua

@@ -1,7 +1,7 @@
 -- status: correct
 -- linux: yes
--- mingw: yes
--- win: yes
+-- mingw: no
+-- win: no
 -- mac: yes
 
 oms_setCommandLineOption("--suppressPath=true")