ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-19 21:27:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix various issues in scheduled CI jobs (#1419)

Browse Source 
- Update S_overrides.mk for SIM_test_varserv so it links correctly in 32 bit (why did only that one have a problem? the world will never know)
- Stop testing Debian Bookworm on python2.7 since support was removed
- Fix some TrickOps unit tests
This commit is contained in:
Jacqueline Deans 2022-12-14 17:04:09 -06:00 committed by GitHub
parent 75b05a865f
commit 48f6f76ef3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/alt_linux_distros.yml vendored
View File

@ -55,7 +55,6 @@ jobs:
libudunits2-dev libudunits2-dev
libgtest-dev libgtest-dev
default-jdk default-jdk
python2.7-dev
python3-dev python3-dev
python3-pip python3-pip
python3-venv python3-venv
@ -113,6 +112,16 @@ jobs:
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
apt-get update apt-get update
apt-get install -y tzdata apt-get install -y tzdata
#-------- Python2.7 dependencies ---------------------------
- cfg: { arch: debian }
python: 2
python_deps: >-
python2.7-dev
#-------- Exclude bookworm on python 2 ---------------------
exclude:
- cfg: { tag: bookworm }
python: 2
#-------- OS and Version Specific Dependencies ---------------- #-------- OS and Version Specific Dependencies ----------------
# None # None
#-------- Job definition ---------------- #-------- Job definition ----------------
@ -129,6 +138,7 @@ jobs:
${{matrix.arch_deps}} ${{matrix.arch_deps}}
${{matrix.os_deps}} ${{matrix.os_deps}}
${{matrix.tag_deps}} ${{matrix.tag_deps}}
${{matrix.python_deps}}
- name: Install GTest - name: Install GTest
run: ${{matrix.install_gtest}} run: ${{matrix.install_gtest}}
- name: Checkout repository - name: Checkout repository

4
.github/workflows/report_alt_linux_distros.yml vendored
View File

@ -19,6 +19,10 @@ jobs:
- { os: debian, tag: bookworm, arch: debian, arch_ver: 12 } - { os: debian, tag: bookworm, arch: debian, arch_ver: 12 }
- { os: almalinux, tag: 8, arch: rhel, arch_ver: 8 } - { os: almalinux, tag: 8, arch: rhel, arch_ver: 8 }
python: [2, 3] python: [2, 3]
#-------- Exclude bookworm on python 2 ---------------------
exclude:
- cfg: { tag: bookworm }
python: 2
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:

2
.github/workflows/test_32.yml vendored
View File

@ -27,7 +27,7 @@ jobs:
glibc.i686 glibc-devel.i686 udunits2 udunits2-devel gtest-devel.i686 glibc.i686 glibc-devel.i686 udunits2 udunits2-devel gtest-devel.i686
java-11-openjdk java-11-openjdk-devel expat-devel.i686 java-11-openjdk java-11-openjdk-devel expat-devel.i686
which gcc-gfortran git wget gsl-devel gtest-devel gsl-devel.i686 which gcc-gfortran git wget gsl-devel gtest-devel gsl-devel.i686
maven udunits2 udunits2-devel zip maven udunits2 udunits2-devel zip libgcc*i686 libstdc++*i686 glibc*i686
- name: Symlink python - name: Symlink python
run: | run: |
cd /usr/lib cd /usr/lib

1
share/trick/trickops/tests/trick_sims.yml
View File

@ -150,7 +150,6 @@ SIM_test_varserv:
labels: labels:
- unit_test - unit_test
runs: runs:
RUN_test/realtime.py:
RUN_test/unit_test.py: RUN_test/unit_test.py:
SIM_threads: SIM_threads:
path: test/SIM_threads path: test/SIM_threads

6
share/trick/trickops/tests/ut_TrickWorkflow.py
View File

@ -42,7 +42,7 @@ class TrickWorkflowTestCase(unittest.TestCase):
self.assertEqual(len(build_jobs), 56) self.assertEqual(len(build_jobs), 56)
self.assertEqual(len(self.instance.sims), 56) self.assertEqual(len(self.instance.sims), 56)
run_jobs = self.instance.get_jobs('run') run_jobs = self.instance.get_jobs('run')
self.assertEqual(len(run_jobs), 38) self.assertEqual(len(run_jobs), 37 )
def test_init_empty_so_raises(self): def test_init_empty_so_raises(self):
with self.assertRaises(RuntimeError): with self.assertRaises(RuntimeError):
@ -195,9 +195,9 @@ class TrickWorkflowTestCase(unittest.TestCase):
builds = self.instance.get_jobs('builds') builds = self.instance.get_jobs('builds')
self.assertEqual(len(builds), 56) self.assertEqual(len(builds), 56)
runs = self.instance.get_jobs('run') runs = self.instance.get_jobs('run')
self.assertEqual(len(runs), 38) self.assertEqual(len(runs), 37)
runs = self.instance.get_jobs('runs') runs = self.instance.get_jobs('runs')
self.assertEqual(len(runs), 38) self.assertEqual(len(runs), 37)
vg = self.instance.get_jobs('valgrind') vg = self.instance.get_jobs('valgrind')
self.assertEqual(len(vg), 1) self.assertEqual(len(vg), 1)
vg = self.instance.get_jobs('valgrinds') vg = self.instance.get_jobs('valgrinds')

11
test/SIM_test_varserv/S_overrides.mk
View File

@ -1,14 +1,13 @@
TRICK_CFLAGS += -I./models TRICK_CFLAGS += -I./models
TRICK_CXXFLAGS += -I./models TRICK_CXXFLAGS += -I./models -I$(GTEST_HOME)/include -std=c++11
all: test_client all: test_client
clean: clean_test_client clean: clean_test_client
TEST_CLIENT_LIBS += -L${GTEST_HOME}/lib64 -L${GTEST_HOME}/lib -lgtest -lgtest_main -lpthread TEST_CLIENT_LIBS += -L${GTEST_HOME}lib64 -L${GTEST_HOME}lib -lgtest -lgtest_main -lpthread
test_client: models/test_client/test_client.cpp test_client: models/test_client/test_client.cpp
cd models/test_client; $(TRICK_CXX) test_client.cpp -o test_client $(TEST_CLIENT_LIBS) -std=c++11 cd models/test_client; $(TRICK_CXX) test_client.cpp $(TRICK_SYSTEM_LDFLAGS) $(TRICK_CXXFLAGS) -o test_client $(TEST_CLIENT_LIBS) -std=c++11
clean_test_client: clean_test_client:
rm -f models/test_client/test_client rm -f models/test_client/test_client