Skip to content

Commit 5ef46c0

Browse files
committed
With the help of @Kaylebor make the xonsh tests actual tests. They now fail with an error if something is wrong. Also suppressed output of the grep commands, we are only interested in the command result status, not in the output.
1 parent 9dfe9fa commit 5ef46c0

1 file changed

Lines changed: 11 additions & 9 deletions

File tree

.github/workflows/tests.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,23 +74,24 @@ jobs:
7474
. $PWD/asdf/asdf.sh
7575
. set-java-home.bash
7676
_asdf_java_prompt_command
77-
echo $JAVA_HOME | grep adoptopenjdk-8.0.252+9.1.openj9-0.20.0
77+
echo $JAVA_HOME | grep -q adoptopenjdk-8.0.252+9.1.openj9-0.20.0
7878
shell: bash {0}
79-
- name: Run JAVA_HOME setting test xonsh (returns success even though it might fail!)
79+
- name: Run JAVA_HOME setting test xonsh
8080
env:
8181
GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8282
run: |
83+
$RAISE_SUBPROC_ERROR = True
8384
source-bash $PWD/asdf/asdf.sh
8485
source set-java-home.xsh
85-
echo $JAVA_HOME | grep adoptopenjdk-8.0.252+9.1.openj9-0.20.0
86+
echo $JAVA_HOME | grep -q adoptopenjdk-8.0.252+9.1.openj9-0.20.0
8687
shell: xonsh {0}
8788
- name: Run JAVA_HOME setting test zsh
8889
env:
8990
GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9091
run: |
9192
source $HOME/.zshrc
9293
asdf_update_java_home
93-
echo $JAVA_HOME | grep adoptopenjdk-8.0.252+9.1.openj9-0.20.0
94+
echo $JAVA_HOME | grep -q adoptopenjdk-8.0.252+9.1.openj9-0.20.0
9495
shell: zsh {0}
9596
- name: Setup system tool-version test on macOS
9697
if: matrix.os == 'macOS-latest'
@@ -112,7 +113,7 @@ jobs:
112113
run: |
113114
cd system
114115
asdf_update_java_home
115-
echo $JAVA_HOME | grep "/Library/Java/JavaVirtualMachines/"
116+
echo $JAVA_HOME | grep -q "/Library/Java/JavaVirtualMachines/"
116117
shell: fish {0}
117118
- name: Run system tool-version test on macOS with bash
118119
if: matrix.os == 'macOS-latest'
@@ -123,17 +124,18 @@ jobs:
123124
. set-java-home.bash
124125
cd system
125126
_asdf_java_prompt_command
126-
echo $JAVA_HOME | grep "/Library/Java/JavaVirtualMachines/"
127+
echo $JAVA_HOME | grep -q "/Library/Java/JavaVirtualMachines/"
127128
shell: bash {0}
128-
- name: Run system tool-version test on macOS with xonsh (returns success even though it might fail!)
129+
- name: Run system tool-version test on macOS with xonsh
129130
if: matrix.os == 'macOS-latest'
130131
env:
131132
GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
132133
run: |
134+
$RAISE_SUBPROC_ERROR = True
133135
source-bash $PWD/asdf/asdf.sh
134136
source set-java-home.xsh
135137
cd system
136-
echo $JAVA_HOME | grep "/Library/Java/JavaVirtualMachines/"
138+
echo $JAVA_HOME | grep -q "/Library/Java/JavaVirtualMachines/"
137139
shell: xonsh {0}
138140
- name: Run system tool-version test on macOS with zsh
139141
if: matrix.os == 'macOS-latest'
@@ -143,5 +145,5 @@ jobs:
143145
source $HOME/.zshrc
144146
cd system
145147
asdf_update_java_home
146-
echo $JAVA_HOME | grep "/Library/Java/JavaVirtualMachines/"
148+
echo $JAVA_HOME | grep -q "/Library/Java/JavaVirtualMachines/"
147149
shell: zsh {0}

0 commit comments

Comments
 (0)