-
Notifications
You must be signed in to change notification settings - Fork 710
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge "[ FAB-4016 ] fix run_fvt_test redirect error"
- Loading branch information
Showing
3 changed files
with
26 additions
and
29 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,39 @@ | ||
| #!/bin/bash | ||
| FABRIC_CA=$GOPATH/src/github.com/hyperledger/fabric-ca | ||
| SCRIPTDIR="$FABRIC_CA/scripts/fvt" | ||
| export TESTCASE="fabric-ca-fvt" | ||
| . $SCRIPTDIR/fabric-ca_utils | ||
| export RESULTLOG="/tmp/fvt-test.results" | ||
| export STARTIME=$SECONDS | ||
| export PATH=$PATH:$GOPATH/bin | ||
| export RC=0 | ||
| . $SCRIPTDIR/fabric-ca_utils | ||
| export FABRIC_TLS | ||
| > $RESULTLOG | ||
|
|
||
| ( | ||
| TimeStamp | ||
| echo "Running fvt tests ..." | ||
| function runTests() { | ||
| echo "Running fvt tests ..." | ||
| tests="$(find $SCRIPTDIR -maxdepth 1 -name "*test.*sh")" | ||
|
|
||
| for TLS in $SCRIPTDIR/tls.env $SCRIPTDIR/notls.env; do | ||
| . $TLS | ||
| export PATH=$PATH:$GOPATH/bin | ||
| tests="$(find $SCRIPTDIR -maxdepth 1 -name "*test**sh")" | ||
| for cmd in $tests; do | ||
| echo "" | ||
| echo "*******************" | ||
| TESTCASE="${cmd##*/}" | ||
| echo "${cmd}" | ||
| echo "*******************" | ||
| ${cmd} 2>&1 | ||
| RC=$((RC+$?)) | ||
| $SCRIPTDIR/fabric-ca_setup.sh -R | ||
| echo "" | ||
| echo "" | ||
| echo "" | ||
| done | ||
| done | ||
| for FABRIC_TLS in "true" "false"; do | ||
| for cmd in $tests; do | ||
| echo "" | ||
| echo "*******************" | ||
| export TESTCASE="${cmd##*/}" | ||
| echo "${cmd}" | ||
| echo "*******************" | ||
| ${cmd} | ||
| RC=$((RC+$?)) | ||
| $SCRIPTDIR/fabric-ca_setup.sh -R | ||
| echo "" | ||
| echo "" | ||
| echo "" | ||
| done | ||
| done | ||
| } | ||
|
|
||
| echo "Finished running fvt tests" | ||
| TimeStamp | ||
| runTests > >( tee $RESULTLOG ) | ||
| grep RC: $RESULTLOG | ||
| echo $RC >> $RESULTLOG | ||
| ) | tee -a $RESULTLOG 2>&1 | ||
| RC=$(tail -n1 $RESULTLOG) | ||
| echo "Finished running fvt tests" | ||
| TESTCASE="fabric-ca-fvt" | ||
| CleanUp "$RC" | ||
| exit "$RC" |