From 3036dd867e4115c9c51109ffe3f2e687c877361e Mon Sep 17 00:00:00 2001 From: Michael Langmayr Date: Tue, 13 Aug 2024 09:27:14 -0700 Subject: [PATCH 1/7] fix e2e tests --- .github/workflows/cmake-workflow.yml | 51 ++-------------------------- 1 file changed, 2 insertions(+), 49 deletions(-) diff --git a/.github/workflows/cmake-workflow.yml b/.github/workflows/cmake-workflow.yml index 0bcec366..d0a7528f 100644 --- a/.github/workflows/cmake-workflow.yml +++ b/.github/workflows/cmake-workflow.yml @@ -5,13 +5,6 @@ on: branches: [ "main" ] pull_request: branches: [ "main" ] - -env: - # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) - INTERFACE_TYPE_ARCHON: Archon - INTERFACE_TYPE_ASTROCAM: AstroCam - DETECTOR_TYPE_HXRG: Hxrg - jobs: Archon-build: runs-on: ubuntu-latest @@ -19,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Install dependecies + - name: Install dependencies run: | ls -l .github/workflows/install-deps.sh @@ -30,7 +23,7 @@ jobs: cd ${{github.workspace}}/build rm -rf * g++ --version - cmake -DDETECTOR_TYPE=${{env.DETECTOR_TYPE_HXRG}} .. + cmake .. - name: Build @@ -75,43 +68,3 @@ jobs: command_printstatus=$(cam printstatus) check $command_printstatus - - # Comment AstroCam out for now - # AstroCam-build: - # runs-on: ubuntu-20.04 - - # steps: - # - uses: actions/checkout@v4 - - # - name: Install dependecies - # run: .github/workflows/install-deps.sh - # shell: bash - - # - name: Install ARC64PCI - # run: | - # cd ${{github.workspace}}/.. - # git clone https://github.com/CaltechOpticalObservatories/Arc64PCI.git - # cd Arc64PCI - # g++ --version - # make - - # - name: Install ARC-API - # run: | - # cd ${{github.workspace}}/.. - # git clone https://github.com/CaltechOpticalObservatories/ARC_API_36.git - # cd ARC_API_36 - # g++ --version - # make - - # - name: Configure CMake AstroCam - # run: | - # cd ${{github.workspace}}/build - # rm -rf * - # cmake -DINTERFACE_TYPE=${{env.INTERFACE_TYPE_ASTROCAM}} -DDETECTOR_TYPE=${{env.DETECTOR_TYPE_HXRG}} .. - - # - name: Build AstroCam - # # Build your program with the given configuration - # run: | - # cd ${{github.workspace}}/build - # make - From df3d1a0fdd61dab10071595b8dcaefb599525bf7 Mon Sep 17 00:00:00 2001 From: Michael Langmayr Date: Tue, 13 Aug 2024 09:36:14 -0700 Subject: [PATCH 2/7] fix e2e tests --- .github/workflows/cmake-workflow.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/cmake-workflow.yml b/.github/workflows/cmake-workflow.yml index d0a7528f..39b20cb6 100644 --- a/.github/workflows/cmake-workflow.yml +++ b/.github/workflows/cmake-workflow.yml @@ -54,12 +54,18 @@ jobs: alias cam="bin/socksend -h localhost -p 3031" function check { if [ $1 != "DONE" ]; then echo $1; exit 1; else echo $1; fi } + echo "TEST" + command_open=$(cam open) check $command_open + echo "TEST2" + command_load=$(cam load) check $command_load + echo "TEST3" + # command_exptime=$(cam exptime 1500) # check $command_exptime From 67540e32e338d869dcea901f125fb8242dd08e6d Mon Sep 17 00:00:00 2001 From: Michael Langmayr Date: Tue, 13 Aug 2024 09:43:06 -0700 Subject: [PATCH 3/7] fix e2e tests --- .github/workflows/cmake-workflow.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/cmake-workflow.yml b/.github/workflows/cmake-workflow.yml index 39b20cb6..f640bc6d 100644 --- a/.github/workflows/cmake-workflow.yml +++ b/.github/workflows/cmake-workflow.yml @@ -56,6 +56,10 @@ jobs: echo "TEST" + bin/socksend -h localhost -p 3031 open + + echo "TEST 1/2" + command_open=$(cam open) check $command_open From b9a0e152e227f8c618ffcb4c4ebe6c2136efabd3 Mon Sep 17 00:00:00 2001 From: Michael Langmayr Date: Tue, 13 Aug 2024 10:17:42 -0700 Subject: [PATCH 4/7] add -i flag to emulator --- .github/workflows/cmake-workflow.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cmake-workflow.yml b/.github/workflows/cmake-workflow.yml index f640bc6d..824df80d 100644 --- a/.github/workflows/cmake-workflow.yml +++ b/.github/workflows/cmake-workflow.yml @@ -22,10 +22,8 @@ jobs: run: | cd ${{github.workspace}}/build rm -rf * - g++ --version cmake .. - - name: Build run: | cd ${{github.workspace}}/build @@ -40,7 +38,7 @@ jobs: - name: Start Emulator run: | cd ${{github.workspace}} - bin/emulator Config/demo/demo.cfg & + bin/emulator Config/demo/demo.cfg -i generic & - name: Start camera-daemon run: | @@ -53,10 +51,6 @@ jobs: shopt -s expand_aliases alias cam="bin/socksend -h localhost -p 3031" function check { if [ $1 != "DONE" ]; then echo $1; exit 1; else echo $1; fi } - - echo "TEST" - - bin/socksend -h localhost -p 3031 open echo "TEST 1/2" @@ -70,11 +64,11 @@ jobs: echo "TEST3" - # command_exptime=$(cam exptime 1500) - # check $command_exptime + command_exptime=$(cam exptime 1500) + check $command_exptime - # command_expose=$(cam expose) - # check $command_expose + command_expose=$(cam expose) + check $command_expose command_printstatus=$(cam printstatus) check $command_printstatus From db3b6586627807ee6a56e2d66063a9e86f2ccd2c Mon Sep 17 00:00:00 2001 From: Michael Langmayr Date: Tue, 13 Aug 2024 10:20:26 -0700 Subject: [PATCH 5/7] fix e2e tests --- .github/workflows/cmake-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-workflow.yml b/.github/workflows/cmake-workflow.yml index 824df80d..92550a4a 100644 --- a/.github/workflows/cmake-workflow.yml +++ b/.github/workflows/cmake-workflow.yml @@ -64,8 +64,8 @@ jobs: echo "TEST3" - command_exptime=$(cam exptime 1500) - check $command_exptime + # command_exptime=$(cam exptime 0) + # check $command_exptime command_expose=$(cam expose) check $command_expose From a6874ef321c900fd7aeb58f2ca2abbbf1adb4c30 Mon Sep 17 00:00:00 2001 From: Michael Langmayr Date: Tue, 13 Aug 2024 10:23:11 -0700 Subject: [PATCH 6/7] fix e2e tests --- .github/workflows/cmake-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-workflow.yml b/.github/workflows/cmake-workflow.yml index 92550a4a..2234220d 100644 --- a/.github/workflows/cmake-workflow.yml +++ b/.github/workflows/cmake-workflow.yml @@ -64,8 +64,8 @@ jobs: echo "TEST3" - # command_exptime=$(cam exptime 0) - # check $command_exptime + command_exptime=$(cam exptime 0) + check $command_exptime command_expose=$(cam expose) check $command_expose From 4fd86fe608e740e6e40a4bf07f6eb6d2a8fca61c Mon Sep 17 00:00:00 2001 From: Michael Langmayr Date: Tue, 13 Aug 2024 10:25:08 -0700 Subject: [PATCH 7/7] fix e2e tests --- .github/workflows/cmake-workflow.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/cmake-workflow.yml b/.github/workflows/cmake-workflow.yml index 2234220d..f10b186f 100644 --- a/.github/workflows/cmake-workflow.yml +++ b/.github/workflows/cmake-workflow.yml @@ -52,21 +52,12 @@ jobs: alias cam="bin/socksend -h localhost -p 3031" function check { if [ $1 != "DONE" ]; then echo $1; exit 1; else echo $1; fi } - echo "TEST 1/2" - command_open=$(cam open) check $command_open - echo "TEST2" - command_load=$(cam load) check $command_load - echo "TEST3" - - command_exptime=$(cam exptime 0) - check $command_exptime - command_expose=$(cam expose) check $command_expose