Skip to content

Commit

Permalink
ssl-opt.sh: support to parse --outcome-file
Browse files Browse the repository at this point in the history
Adjust where to set absolute path for MBEDTLS_TEST_OUTCOME_FILE
as it's supposed to set its absolute path after all possible
value assignment.

Signed-off-by: Yanray Wang <[email protected]>
  • Loading branch information
Yanray Wang committed Feb 28, 2023
1 parent e53a7ee commit fa455cd
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions tests/ssl-opt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,9 @@ get_options() {
-p|--preserve-logs)
PRESERVE_LOGS=1
;;
--outcome-file)
shift; MBEDTLS_TEST_OUTCOME_FILE=$1
;;
--port)
shift; SRV_PORT=$1
;;
Expand All @@ -200,14 +203,6 @@ get_options() {
done
}

# Make the outcome file path relative to the original directory, not
# to .../tests
case "$MBEDTLS_TEST_OUTCOME_FILE" in
[!/]*)
MBEDTLS_TEST_OUTCOME_FILE="$ORIGINAL_PWD/$MBEDTLS_TEST_OUTCOME_FILE"
;;
esac

# Read boolean configuration options from mbedtls_config.h for easy and quick
# testing. Skip non-boolean options (with something other than spaces
# and a comment after "#define SYMBOL"). The variable contains a
Expand Down Expand Up @@ -1599,6 +1594,14 @@ cleanup() {

get_options "$@"

# Make the outcome file path relative to the original directory, not
# to .../tests
case "$MBEDTLS_TEST_OUTCOME_FILE" in
[!/]*)
MBEDTLS_TEST_OUTCOME_FILE="$ORIGINAL_PWD/$MBEDTLS_TEST_OUTCOME_FILE"
;;
esac

populate_enabled_hash_algs

# Optimize filters: if $FILTER and $EXCLUDE can be expressed as shell
Expand Down

0 comments on commit fa455cd

Please sign in to comment.