From: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Date: Wed, 26 May 2021 16:38:32 +0000 (+0300)
Subject: Fix exit code, support individual suite execution
X-Git-Tag: 1.7.0~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=516c3f71f626df6e4200cc2d8e2c9fea5d6455a9;p=dcaegen2%2Fservices%2Fpm-mapper.git

Fix exit code, support individual suite execution

Issue-ID: DCAEGEN2-2796
Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Change-Id: I1d4afacc6a125300495404e6734fc105ca1720c3
---

diff --git a/csit/README.md b/csit/README.md
index 88d0411..cdfaf2f 100644
--- a/csit/README.md
+++ b/csit/README.md
@@ -36,3 +36,9 @@ cd csit
 ./run-project-csit.sh
 ```
 
+To run any individual suite, use run-csit.sh with appropriate plans subdirectory, for example:
+
+```bash
+./run-csit.sh plans/pmmapper
+```
+
diff --git a/csit/run-csit.sh b/csit/run-csit.sh
index fcbcbe1..19dfcce 100755
--- a/csit/run-csit.sh
+++ b/csit/run-csit.sh
@@ -128,7 +128,7 @@ then
 fi
 
 if [ -z "$WORKSPACE" ]; then
-    export WORKSPACE=$(git rev-parse --show-toplevel)
+    export WORKSPACE=$(git rev-parse --show-toplevel)/csit
 fi
 
 if [ -f "${WORKSPACE}/${1}/testplan.txt" ]; then
diff --git a/csit/run-project-csit.sh b/csit/run-project-csit.sh
index 12eb349..c19d9bb 100755
--- a/csit/run-project-csit.sh
+++ b/csit/run-project-csit.sh
@@ -30,4 +30,6 @@ for dir in plans/*/
 do
     dir=${dir%*/}  # remove the trailing /
    ./run-csit.sh ${dir} ${TESTOPTIONS}
+   ((i+=$?))
 done
+exit $i