Skip to content

Commit

Permalink
Minor improvement for unit tests on Travis-CI
Browse files Browse the repository at this point in the history
Signed-off-by: Richard Bonhomme <[email protected]>
  • Loading branch information
TinCanTech committed Feb 28, 2021
1 parent ebfd83d commit 3a8ffed
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
4 changes: 2 additions & 2 deletions easytls
Original file line number Diff line number Diff line change
Expand Up @@ -4641,6 +4641,7 @@ save_wiscii_hash ()
then
printf '%s' "$counted_wiscii" > "$EASYTLS_WISCII_HASH" || return 1
fi
easytls_verbose "Master hash save OK"
}

# Verify wiscii hash
Expand All @@ -4655,6 +4656,7 @@ verify_wiscii_hash ()
fi
counted_wiscii="$(generate_wiscii_hash)"
[ "$counted_wiscii" = "$bottled_wiscii" ] || return 1
easytls_verbose "Master hash check OK"
}


Expand Down Expand Up @@ -4863,7 +4865,6 @@ then
* Some files have been manually altered, restore the changes to continue..'
die "Master hash check failed"
}
easytls_verbose "Master hash check OK"
fi

# Load config options - Does not change command line options
Expand Down Expand Up @@ -4998,6 +4999,5 @@ easytls_auto_check || die "Error: easytls_auto_check"

# save me!
save_wiscii_hash || die "Master hash save failed"
easytls_verbose "Master hash save OK"

# vim: ft=sh nu ai sw=8 ts=8 noet
6 changes: 0 additions & 6 deletions easytls-op-test.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
#!/bin/sh

#export EASYTLS_UTEST_CURL_TARGET="${EASYTLS_UTEST_CURL_TARGET:-TinCanTech/easytls-unit-tests}"
#curl -O "https://raw.githubusercontent.com/$EASYTLS_UTEST_CURL_TARGET/master/easytls-unit-tests.sh"


CURL_TARGET="https://raw.githubusercontent.com/OpenVPN/easy-rsa/master/easyrsa3/easyrsa"
curl -O "$CURL_TARGET" || exit 77
CURL_TARGET="https://raw.githubusercontent.com/OpenVPN/easy-rsa/master/easyrsa3/openssl-easyrsa.cnf"
Expand All @@ -12,8 +8,6 @@ CURL_TARGET="https://raw.githubusercontent.com/TinCanTech/Prebuilt-OpenVPN/maste
curl -O "$CURL_TARGET" || exit 77
echo

EXIT_CODE=1

Required_file="./easyrsa"
if [ -e "$Required_file" ];
then
Expand Down

0 comments on commit 3a8ffed

Please sign in to comment.