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

feature(make-exercise): support optional test options #137

Merged
merged 1 commit into from
Aug 1, 2024
Merged

feature(make-exercise): support optional test options #137

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
28 changes: 19 additions & 9 deletions bin/make-exercise
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,23 @@
# -----------------------------------------------------------------------------
# Exercism practice exercise generator for the Rexx language track.
#
# Two action groups are implemented. The first group is invoked as follows:
# Three action groups are implemented. The first group is invoked as follows:
#
# $1 -> action to perform (update-testlib, help, version)
#
# These are generic actions, including the 'update-testlib' action, which
# installs or updates the test library. The second group is the more
# commonly used, and may be invoked via:
#
# $1 -> action to perform (create, remove, configure, or test, exercise)
# $1 -> action to perform (create, remove, or configure, exercise)
# $2 -> name of the exercise subdirectory
#
# The third group is invoked as follows:
#
# $1 -> action to perform (test exercise)
# $2 -> name of the exercise subdirectory
# $3 -> optional test options
#
# The script creates, removes, configures, or tests, a subdirectory,
# corresponding to the nominated exercises, in the following directory:
#
Expand Down Expand Up @@ -185,7 +191,7 @@ print_and_exit() {
}

print_usage_and_exit() {
print_and_exit 1 "Usage: ${0} help|update-testlib|version|[create|remove|configure|test exercise]"
print_and_exit 1 "Usage: ${0} help|update-testlib|version|[create|remove|configure exercise]|[test exercise [testoptions]]"
}

is_test_library_installed() {
Expand Down Expand Up @@ -293,7 +299,7 @@ configure_exercise() {
## Bash launcher (and ensure it is executable)
echo $'#!/usr/bin/env bash' > test-${exercise}
echo $'cd "testlib" 2>&1 >/dev/null' >> test-${exercise}
echo $'if [ $# -eq 0 ] ; then ./runt --regina ../'${exercise}-check' ../'${exercise}' ../'${exercise}-toplevel ${exercise}-funcs' ; else ./runt "$@" ../'${exercise}-check' ../'${exercise}' ../'${exercise}-toplevel ${exercise}-funcs' ; fi' >> test-${exercise}
echo $'if [ $# -eq 0 ] ; then ./runt --regina ../'${exercise}-check' ../'${exercise}' ../'${exercise}-toplevel ${exercise}-funcs' ; else ./runt $@ ../'${exercise}-check' ../'${exercise}' ../'${exercise}-toplevel ${exercise}-funcs' ; fi' >> test-${exercise}
echo $'cd - 2>&1 >/dev/null' >> test-${exercise}
#### NOTE: If files reside on a non-EXT4 filesystem (e.g. NTFS) then the git index needs updating.
#### => git update-index --chmod=+x test-${exercise}
Expand Down Expand Up @@ -356,7 +362,8 @@ REXX_SCRIPT

test_exercise() {
# Override any previous setting with function argument
local exercise=${1}
local exercise=${1} ; shift
local testopts="$@"
local exerdir=exercises/practice/${exercise}

# Create temporary directory, and copy exercise directory contents to it
Expand All @@ -375,7 +382,9 @@ test_exercise() {
&& mv example-toplevel.rexx "${exercise}"-toplevel.rexx ; \
}
# Run tests, and collect result code
./test-"${exercise}"
[ -z "${testopts}" ] \
&& ./test-"${exercise}" \
|| ./test-"${exercise}" "${testopts}"
local result=$?
popd 2>&1 >/dev/null
# Cleanup and return result code
Expand Down Expand Up @@ -494,7 +503,8 @@ handle_configure_exercise() {

handle_test_exercise() {
# Override any previous setting with function argument
local exercise=${1}
local exercise=${1} ; shift
local testopts="$@"
local exerdir=exercises/practice/${exercise}

# Ensure a non-empty exercise name is passed
Expand All @@ -510,7 +520,7 @@ handle_test_exercise() {
|| { echo "ERROR: Include entry for ${exercise} in top-level config.json file." ; exit 1 ; }

# Perform TEST tasks via delegation
test_exercise "${exercise}"
test_exercise "${exercise}" "${testopts}"
}

# ---- ENTRY POINT
Expand All @@ -531,6 +541,6 @@ case "${1^^}" in
CREATE) handle_create_exercise "${2}" ;;
REMOVE) handle_remove_exercise "${2}" ;;
CONFIGURE) handle_configure_exercise "${2}" ;;
TEST) handle_test_exercise "${2}" ;;
TEST) exercise="${2}" ; shift ; shift ; handle_test_exercise "${exercise}" "$@" ;;
*) print_usage_and_exit ;;
esac