Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable10] Allow the testing app to not be in the default apps folder #34196

Merged
merged 1 commit into from
Jan 21, 2019
Merged

[stable10] Allow the testing app to not be in the default apps folder #34196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions tests/acceptance/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,16 +662,24 @@ fi
# calculate the correct skeleton folder
# $SRC_SKELETON_DIR is the path to the skeleton folder on the machine where the tests are executed
# it is used for file comparisons in various tests

# The testing app could be in the apps folder, or maybe another apps folder like
# apps2 or apps-external, so be flexible about looking for the local skeleton folder.
API_SKELETON_DIR=`find ${SCRIPT_PATH}/../../ -path "*/testing/data/apiSkeleton"`
API_SKELETON_DIR="`( cd \"${API_SKELETON_DIR}\" && pwd )`" # absolutized and normalized

if [ "${RUNNING_API_TESTS}" = true ]
then
export SRC_SKELETON_DIR="${SCRIPT_PATH}/../../apps/testing/data/apiSkeleton"
export SRC_SKELETON_DIR="${API_SKELETON_DIR}"
elif [ "${RUNNING_CLI_TESTS}" = true ]
then
# CLI tests use the apiSkeleton so that API-based "then" steps can be used
# to check the state of users after CLI commands
export SRC_SKELETON_DIR="${SCRIPT_PATH}/../../apps/testing/data/apiSkeleton"
export SRC_SKELETON_DIR="${API_SKELETON_DIR}"
else
export SRC_SKELETON_DIR="${SCRIPT_PATH}/../../apps/testing/data/webUISkeleton"
WEBUI_SKELETON_DIR=`find ${SCRIPT_PATH}/../../ -path "*/testing/data/webUISkeleton"`
WEBUI_SKELETON_DIR="`( cd \"${WEBUI_SKELETON_DIR}\" && pwd )`" # absolutized and normalized
export SRC_SKELETON_DIR="${WEBUI_SKELETON_DIR}"
fi

# $SKELETON_DIR is the path to the skeleton folder on the machine where oC runs (system under test)
Expand Down