From 652c91187293e54e0b0dc3388c63453337741679 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Wed, 11 Jul 2018 10:15:14 +0200 Subject: [PATCH] Check added/modified regression tests w.r.t master * Find the added/modified regression tests based on diversion from the master branch. --- ci-scripts/ci-runner.bash | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ci-scripts/ci-runner.bash b/ci-scripts/ci-runner.bash index be0e73ca58..169ff40f75 100644 --- a/ci-scripts/ci-runner.bash +++ b/ci-scripts/ci-runner.bash @@ -156,9 +156,8 @@ if [ $CI_GENERIC -eq 1 ]; then elif [ $CI_TUTORIAL -eq 1 ]; then # Run tutorial checks # Find modified or added tutorial checks - tutorialchecks=( $(git log --name-status --oneline --no-merges -1 | \ - awk '/^[AM]/ { print $2 } /^R0[0-9][0-9]/ { print $3 }' | \ - grep -e '^tutorial/(?!config/).*\.py') ) + tutorialchecks=( $(git diff origin/master...HEAD --name-only --oneline --no-merges | \ + grep -e '^tutorial/(?!config/).*\.py') ) if [ ${#tutorialchecks[@]} -ne 0 ]; then tutorialchecks_path="" @@ -196,8 +195,7 @@ else # Find modified or added user checks - userchecks=( $(git log --name-status --oneline --no-merges -1 | \ - awk '/^[AM]/ { print $2 } /^R0[0-9][0-9]/ { print $3 }' | \ + userchecks=( $(git diff origin/master...HEAD --name-only --oneline --no-merges | \ grep -e '^cscs-checks/.*\.py') ) if [ ${#userchecks[@]} -ne 0 ]; then