Skip to content

Commit 785d404

Browse files
authored
Add script interpreter tests (via new generate feature) (#1819)
* Add archive for interpreter testing * Add minimal Python interpreter tests as fields in .qrs
1 parent bdd7503 commit 785d404

File tree

1 file changed

+36
-17
lines changed

1 file changed

+36
-17
lines changed

.github/workflows/installer.yml

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -76,31 +76,50 @@ jobs:
7676
env:
7777
CONCURRENCY: ${{ inputs.concurrency }}
7878

79-
- name: Downloads minimal tests
79+
- name: Downloads minimal tests for Diagram mode
8080
run: |
8181
curl --output tests.7z "https://dl.trikset.com/edu/.solutions20200701/testing_small.7z"
8282
7z x tests.7z || 7za x tests.7z
8383
84-
- name: Run minimal tests
84+
- name: Prepare environment variable
8585
run: |
86-
export QT_QPA_PLATFORM=minimal
87-
TWOD_EXEC_NAME=$(ls -1d "$BIN_DIR"/2D-model* | head -n 1)
88-
for i in "$GITHUB_WORKSPACE"/testing_small/*; do "$TWOD_EXEC_NAME" -b -s 5 "$i"; done
86+
echo "QT_QPA_PLATFORM=offscreen" >> $GITHUB_ENV
87+
TWOD_EXEC_NAME=$(ls -1d "$BIN_DIR"/2D-model* | head -n 1) && echo "TWOD_EXEC_NAME=$TWOD_EXEC_NAME" >> $GITHUB_ENV
88+
TRIK_PYTHONPATH_BUNDLE_DIR="$LIB_DIR"/python-runtime
89+
TRIK_PYTHONPATH=.:"${TRIK_PYTHONPATH_BUNDLE_DIR}/base_library.zip:${TRIK_PYTHONPATH_BUNDLE_DIR}/lib-dynload:${TRIK_PYTHONPATH_BUNDLE_DIR}"
90+
echo "TRIK_PYTHONPATH=$TRIK_PYTHONPATH" >> $GITHUB_ENV
91+
PATCHER_NAME=$(ls -1d "$BIN_DIR"/patcher* | head -n 1) && "PATCHER_NAME=$PATCHER_NAME" >> $GITHUB_ENV
92+
93+
- name: Run minimal tests in diagram mode
94+
run: |
95+
for i in "$GITHUB_WORKSPACE"/testing_small/*; do "$TWOD_EXEC_NAME" --close 5 "$i"; done
96+
rm -rf tests.7z testing_small
8997
90-
- name: Run minimal JavaScript interpeter tests
98+
- name: Downloads minimal tests for script mode
9199
run: |
92-
export QT_QPA_PLATFORM=offscreen
93-
TWOD_EXEC_NAME=$(ls -1d "$BIN_DIR"/2D-model* | head -n 1)
94-
for i in "$GITHUB_WORKSPACE"/testing_small/*.qrs; do "$TWOD_EXEC_NAME" --generate-path "$i".js --generate-mode javascript \
95-
-b -s 5 --script-path "$i".js "$i"; done
100+
curl --output tests.7z "https://dl.trikset.com/edu/.solutions20200706-patched/solutions.7z"
101+
7z x tests.7z || 7za x tests.7z
102+
103+
- name: Run minimal JavaScript interpeter tests in direct script mode
104+
run: |
105+
for i in "$GITHUB_WORKSPACE"/tests/*.qrs; do "$TWOD_EXEC_NAME" --generate-path "$i".js --generate-mode javascript --close \
106+
-s 5 --script-path "$i".js -m script "$i"; done
96107
if: startsWith(inputs.os, 'ubuntu')
97108

98-
- name: Run minimal Python interpeter tests
109+
- name: Run minimal Python interpeter tests in direct script mode
99110
run: |
100-
export QT_QPA_PLATFORM=offscreen
101-
TRIK_PYTHONPATH_BUNDLE_DIR="$LIB_DIR"/python-runtime
102-
export TRIK_PYTHONPATH=.:"${TRIK_PYTHONPATH_BUNDLE_DIR}/base_library.zip:${TRIK_PYTHONPATH_BUNDLE_DIR}/lib-dynload:${TRIK_PYTHONPATH_BUNDLE_DIR}"
103-
TWOD_EXEC_NAME=$(ls -1d $BIN_DIR/2D-model* | head -n 1)
104-
for i in "$GITHUB_WORKSPACE"/testing_small/*.qrs; do "$TWOD_EXEC_NAME" --generate-path "$i".py \
105-
-b -s 5 --script-path "$i".py "$i"; done
111+
for i in "$GITHUB_WORKSPACE"/tests/*.qrs; do "$TWOD_EXEC_NAME" --generate-path "$i".py \
112+
--close -s 5 --script-path "$i".py -m script "$i"; done
113+
if: startsWith(inputs.os, 'ubuntu')
114+
115+
- name: Run minimal Javascript interpeter tests as fields in .qrs (For backward compatibility)
116+
run: |
117+
for i in "$GITHUB_WORKSPACE"/tests/*.qrs; do "$PATCHER_NAME" -s "$i".js "$i" \
118+
&& "$TWOD_EXEC_NAME" --close -s 5 -m script "$i"; done
119+
if: startsWith(inputs.os, 'ubuntu')
120+
121+
- name: Run minimal Python interpeter tests as fields in .qrs (For backward compatibility)
122+
run: |
123+
for i in "$GITHUB_WORKSPACE"/tests/*.qrs; do "$PATCHER_NAME" -s "$i".py "$i" \
124+
&& "$TWOD_EXEC_NAME" --close -s 5 -m script "$i"; done
106125
if: startsWith(inputs.os, 'ubuntu')

0 commit comments

Comments
 (0)