Skip to content
This repository has been archived by the owner on May 5, 2023. It is now read-only.

Commit

Permalink
Improve error handling in case of duplicate case variant issue #3
Browse files Browse the repository at this point in the history
  • Loading branch information
joergboe committed Jan 3, 2019
1 parent f210776 commit 7cf6d68
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 6 deletions.
6 changes: 2 additions & 4 deletions bin/suite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -681,11 +681,9 @@ while [[ -z $allJobsGone ]]; do
cpreamblError="${casePreambErrors[$jobIndex]}"
#make and cleanup case work dir
if [[ -e $cworkdir ]]; then
printError "Case workdir exists: $cworkdir"
rm -rf "$cworkdir"
else
mkdir -p "$cworkdir"
printErrorAndExit "Case workdir exists! Probably duplicate variant. workdir: $cworkdir" $errSuiteError
fi
mkdir -p "$cworkdir"
tmp=1 # count running jobs + 1
for ((i=0; i<maxParralelJobs; i++)); do
if [[ -n ${tpid[$i]} ]]; then
Expand Down
3 changes: 3 additions & 0 deletions test/duplicateCaseVariant/Case1/TestCase.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
##--variantList='v1 V2 v1'

STEPS=('echo "*************** step 1 ***********"')
3 changes: 3 additions & 0 deletions test/duplicateCaseVariant/Suite1/Case1/TestCase.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#--variantList='v1 V2 v1'

STEPS=('echo "*************** step 1 ***********"')
Empty file.
2 changes: 1 addition & 1 deletion test/duplicateSuiteVariant/Suite1/Case1/TestCase.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
STEPS=('echo *************** step 1 ***********')
STEPS=('echo "*************** step 1 ***********"')
2 changes: 1 addition & 1 deletion test/duplicateSuiteVariant/Suite1/Case2/TestCase.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
STEPS=('echo *************** step 1 ***********')
STEPS=('echo "*************** step 1 ***********"')

0 comments on commit 7cf6d68

Please sign in to comment.