Pau Espin Pedrol has submitted this change and it was merged. (
https://gerrit.osmocom.org/12997 )
Change subject: jenkins: Fix the test for journalctl if it isn't present
......................................................................
jenkins: Fix the test for journalctl if it isn't present
test -x for an empty string is still true. Check if the result of
command is empty or not. It seems to work for the negative case now.
Change-Id: I7e4326df155dae776481bf7824694b3fb47abcad
---
M contrib/jenkins-run.sh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Pau Espin Pedrol: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/contrib/jenkins-run.sh b/contrib/jenkins-run.sh
index 0b41247..4a76c09 100755
--- a/contrib/jenkins-run.sh
+++ b/contrib/jenkins-run.sh
@@ -30,7 +30,7 @@
# tar up all results for archiving (optional)
cd "$trial_dir"
-if [ -x $(command -v journalctl) ]; then
+if [ ! -z "$(command -v journalctl)" ]; then
journalctl -u ofono -o short-precise --since "${time_start}" > "$(readlink
last_run)/ofono.log"
fi
tar czf "$base/${trial_dir}-run.tgz" "$(readlink last_run)"
--
To view, visit https://gerrit.osmocom.org/12997
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e4326df155dae776481bf7824694b3fb47abcad
Gerrit-Change-Number: 12997
Gerrit-PatchSet: 3
Gerrit-Owner: Holger Freyther <[email protected]>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <[email protected]>
