diff --git a/common/common-subtree.sh b/common/common-subtree.sh index 59c5e21b3d73466f45e92bef5c038a13600c297f..b757ed6115ca1f9e3ef9bb64d38df16f0018acbd 100755 --- a/common/common-subtree.sh +++ b/common/common-subtree.sh @@ -7,12 +7,15 @@ usage () { echo "'$0 pull' is used to update the common subtree in tests" } +branch="$(git symbolic-ref --short HEAD)" +test -z "$branch" && branch="master" + case $1 in pull) -git subtree pull -P common git@gitlab.apertis.org:tests/common.git master +git subtree pull -P common git@gitlab.apertis.org:tests/common.git "$branch" ;; add) -git subtree add -P common git@gitlab.apertis.org:tests/common.git master +git subtree add -P common git@gitlab.apertis.org:tests/common.git "$branch" ;; *) usage;; esac diff --git a/common/run-aa-test b/common/run-aa-test index 347676ee8b7a4d7749d4fdb00ca7159c7925b984..2ed214714b9e8ad78fc8bb44fac56ea28eff98ae 100755 --- a/common/run-aa-test +++ b/common/run-aa-test @@ -124,7 +124,14 @@ sleep 3 # Get audit information from journal AUDIT_FILE=${TMP_DIR}/AUDIT -journalctl -S "${START_TIME}" -t audit -o cat > ${AUDIT_FILE} + +uid=$(id -u) +JOURNALCTL="journalctl" +if [ "${UID}" != "0" ] +then + JOURNALCTL="sudo journalctl" +fi +${JOURNALCTL} -S "${START_TIME}" -t audit -o cat > ${AUDIT_FILE} echo "#=== ${TEST_TITLE} ==="