From 6f3312c6576eefdbac120214b1adc0f150b72d98 Mon Sep 17 00:00:00 2001 From: vrvarma Date: Thu, 19 Mar 2020 20:02:54 -0400 Subject: fix csit, cleanup dockerfile for osdf Change-Id: Ie3d44592a382ba8e886c2a7544520cbed6971f84 Signed-off-by: vrvarma Issue-ID: OPTFRA-722 --- test/functest/scripts/start-simulators.sh | 7 ++++++- test/functest/scripts/stop-simulators.sh | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'test/functest/scripts') diff --git a/test/functest/scripts/start-simulators.sh b/test/functest/scripts/start-simulators.sh index a3f3db1..66507d4 100755 --- a/test/functest/scripts/start-simulators.sh +++ b/test/functest/scripts/start-simulators.sh @@ -20,7 +20,12 @@ # This script is in osdf/test/functest/scripts/ -SCRIPTDIR=$(dirname $(readlink -f $0)) +if [[ `uname` == "Darwin" ]] +then + SCRIPTDIR=$(dirname $(greadlink -f $0)) +else + SCRIPTDIR=$(dirname $(readlink -f $0)) +fi FUNC_TEST_DIR=$(dirname $SCRIPTDIR) TEST_DIR=$(dirname $FUNC_TEST_DIR) OSDF_DIR=$(dirname $TEST_DIR) diff --git a/test/functest/scripts/stop-simulators.sh b/test/functest/scripts/stop-simulators.sh index c9dd126..e80a080 100755 --- a/test/functest/scripts/stop-simulators.sh +++ b/test/functest/scripts/stop-simulators.sh @@ -23,7 +23,12 @@ # We don't need all the directory names here and the "cd", but it may be needed later on # Also, it will be a guard against some bad config where the directory doesn't exist -SCRIPTDIR=$(dirname $(readlink -f $0)) +if [[ `uname` == "Darwin" ]] +then + SCRIPTDIR=$(dirname $(greadlink -f $0)) +else + SCRIPTDIR=$(dirname $(readlink -f $0)) +fi FUNC_TEST_DIR=$(dirname $SCRIPTDIR) TEST_DIR=$(dirname $FUNC_TEST_DIR) OSDF_DIR=$(dirname $TEST_DIR) -- cgit 1.2.3-korg