diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42f9f4a..a7b176b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,17 +84,6 @@ jobs: - uses: lukka/get-cmake@v3.22.2 if: matrix.os != 'windows-latest' - -# why not gcc -# - name: Set up CLANG -# if: matrix.os == 'ubuntu-22.04' -# uses: egor-tensin/setup-clang@v1 -# with: -# version: latest -# platform: x64 - - - - name: Build linux if: matrix.os == 'ubuntu-22.04' shell: bash @@ -104,14 +93,7 @@ jobs: if: matrix.os == 'macos-13' shell: bash run: ./scripts/_build_base.sh darwin-x64 darwin-x86_64 - - # - name: Set Perl environment variables # https://github.com/sfackler/rust-openssl/issues/2149 - # if: matrix.os == 'windows-latest' - # run: | - # cpan -i Locale::Maketext::Simple - # echo "PERL=$((where.exe perl)[0])" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8 - # echo "OPENSSL_SRC_PERL=$((where.exe perl)[0])" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8 - + - name: Build Windows if: matrix.os == 'windows-latest' shell: msys2 {0} @@ -147,16 +129,13 @@ jobs: if: matrix.os != 'windows-latest' shell: bash run: | - export target=$(cat target) - echo $(pwd) - echo About to run unit-test-rabbitmq and unit-test-rabbitmq-core - ctest --test-dir build/$target -R unit-test-rabbitmq + echo Running unit-test-rabbitmq-core + ./build/linux-x64/rabbitmq-core/unit-test-rabbitmq-core + echo Running unit-test-rabbitmq + ./build/linux-x64/rabbitmq-core/unit-test-rabbitmq echo Tests complete - name: Run unit tests on WIN - #echo About to run unit-test-rabbitmq and unit-test-rabbitmq-core - #ctest --output-on-failure --test-dir build/$target -R unit-test-rabbitmq - #echo Tests complete if: matrix.os == 'windows-latest' shell: bash run: | @@ -164,13 +143,6 @@ jobs: ls build/ ctest --test-dir build/win-x64 --output-on-failure -R unit-test-rabbitmq echo Tests complete -# pacman -S --noconfirm mingw-w64-x86_64-gcc-libs -# cmake --install build/win-x64 -# echo check for dll dependencies for the core test -# ldd build/win-x64/rabbitmq-core/unit-test-rabbitmq-core.exe -# echo check for dll dependencies for the container test -# ldd build/win-x64/rabbitmq-fmu/unit-test-rabbitmq.exe -# Call ctest - name : Prep for integration tests UBUNTU # these need additional scripts that produce data to the rabbitmq, require rabbitmq server; add -u to see script output if: matrix.os == 'ubuntu-22.04' diff --git a/rabbitmq-fmu/xmls-for-tests/modelDescription.xml b/rabbitmq-fmu/xmls-for-tests/modelDescription.xml index 3666d3f..26c7e48 100644 --- a/rabbitmq-fmu/xmls-for-tests/modelDescription.xml +++ b/rabbitmq-fmu/xmls-for-tests/modelDescription.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <fmiModelDescription fmiVersion="2.0" modelName="RabbitMq" guid="{cfc65592-ffff-4563-9705-1581b6e7071c}" - generationTool="RabbitMQ digital twin generator" numberOfEventIndicators="0" copyright="INTO-CPS" - license="INTO-CPS"> + generationTool="RabbitMQ digital twin generator" numberOfEventIndicators="0" copyright="AU" + license="-"> <CoSimulation modelIdentifier="rabbitmq" needsExecutionTool="true" canHandleVariableCommunicationStepSize="true" canInterpolateInputs="false" maxOutputDerivativeOrder="0" canRunAsynchronuously="false" canBeInstantiatedOnlyOncePerProcess="true" @@ -70,9 +70,22 @@ <ScalarVariable name="config.routingkey.from_cosim" valueReference="13" variability="fixed" causality="parameter" initial="exact"> <String start="data.from_cosim"/> </ScalarVariable> + <ScalarVariable name="config.ssl" valueReference="16" variability="fixed" causality="parameter" initial="exact"> + <Boolean start="0"/> + </ScalarVariable> + <ScalarVariable name="config.queueupperbound" valueReference="17" variability="fixed" causality="parameter" initial="exact"> + <Integer start="100"/> + </ScalarVariable> + <ScalarVariable name="config.vhost" valueReference="18" variability="fixed" causality="parameter" initial="exact"> + <String start="/"/> + </ScalarVariable> + <ScalarVariable name="config.howtosend" valueReference="19" variability="fixed" causality="parameter" initial="exact"> + <Boolean start="1"/> <!-- options, on event (0), or always (1)--> + </ScalarVariable> + - </ModelVariables> - <ModelStructure> + </ModelVariables> + <ModelStructure> <Outputs> <Unknown index="1"/> <Unknown index="2"/> @@ -83,4 +96,5 @@ </InitialUnknowns> </ModelStructure> + </fmiModelDescription>