Merge commit '7828e567' into apertis/v2020dev0

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

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} ==="