Skip to content

Commit

Permalink
[ci] Remove NOP cleanup function
Browse files Browse the repository at this point in the history
  • Loading branch information
hennevogel committed Aug 19, 2015
1 parent 9e2569c commit 5d5e45c
Showing 1 changed file with 4 additions and 14 deletions.
18 changes: 4 additions & 14 deletions dist/ci/obs_testsuite_travis.sh
Expand Up @@ -4,14 +4,16 @@
# Be verbose and fail script on the first error
set -xe

# Everything happens here
pushd src/api

# Which test suite should run? By default: all
if [ -z $1 ]; then
TEST_SUITE="all"
else
TEST_SUITE="$1"
fi

pushd src/api

if test -z "$SUBTEST"; then
export DO_COVERAGE=1
Expand All @@ -27,21 +29,9 @@ if test -z "$SUBTEST"; then
bundle exec rake rubocop
;;
*)
bundle exec rake rubocop
bundle exec rake test:api
bundle exec rake test:webui
bundle exec rake rubocop
;;
esac
fi

cd ../..

echo "Killing backend processes"
if fuser -v $PWD | egrep 'perl|ruby'; then
list=`fuser -v $PWD 2>&1 | egrep 'perl|ruby' | sed -e "s,^ *$USER *,,;" | cut '-d ' -f1`
for p in $list; do
echo "Kill $p"
# the process might have gone away on its own, so use || true
kill $p || true
done
fi

0 comments on commit 5d5e45c

Please sign in to comment.