yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-23 04:55:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/pr/2940' into baremetal

Browse source
This commit is contained in:
Simon Butcher 2019-12-05 14:32:54 +00:00
parent 501c466d01 e06e039f7a
commit 0252cd6876
2 changed files with 41 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/config.pl
View file

@ -213,11 +213,15 @@ if ( not defined($action) ){ die $usage; }
# Check the config file is present
if (! -f $config_file) {
chdir '..' or die;
# Confirm this is the project root directory and try again
if ( !(-d 'scripts' && -d 'include' && -d 'library' && -f $config_file) ) {
die "If no file specified, must be run from the project root or scripts directory.\n";
if ( -d 'importer' && -d 'inc' && -d 'src') {
$config_file = "inc/mbedtls/config.h";
}
else {
chdir '..' or die;
# Confirm this is the project root directory and try again
if ( !(-d 'scripts' && -d 'include' && -d 'library' && -f $config_file) ) {
die "If no file specified, must be run from the project root or scripts directory.\n";
}
}
}

37
tests/scripts/basic-build-test.sh
View file

@ -25,13 +25,37 @@
#
# This script has been written to be generic and should work on any shell.
#
# Usage: basic-build-tests.sh
# Usage: basic-build-tests.sh to run all tests
# basic-build-tests.sh unit_test to run only unit tests
#
# Abort on errors (and uninitiliased variables)
set -eu
if [ -d library -a -d include -a -d tests ]; then :; else
CONFIG_H='include/mbedtls/config.h'
CONFIG_BAK="$CONFIG_H.bak"
UNIT_TESTS_ONLY=0
echo
if [ -z ${1+x} ]
then
echo "Running all tests"
else
if [ "$1" = "unit_test" ]
then
echo "Running only unit tests"
UNIT_TESTS_ONLY=1
fi
fi
echo
# Check test environment. If importer, src and inc folders are present then
# there is a different directory structure and we need to adapt to it.
if [ -d importer -a -d inc -a -d src ]; then
CONFIG_H='inc/mbedtls/config.h'
CONFIG_BAK="$CONFIG_H.bak"
elif [ -d library -a -d include -a -d tests ]; then :; else
echo "Must be run from mbed TLS root" >&2
exit 1
fi
@ -49,9 +73,6 @@ export OPENSSL_CMD="$OPENSSL"
export GNUTLS_CLI="$GNUTLS_CLI"
export GNUTLS_SERV="$GNUTLS_SERV"
CONFIG_H='include/mbedtls/config.h'
CONFIG_BAK="$CONFIG_H.bak"
# Step 0 - print build environment info
OPENSSL="$OPENSSL" \
OPENSSL_LEGACY="$OPENSSL_LEGACY" \
@ -79,6 +100,12 @@ cd tests
perl scripts/run-test-suites.pl -v 2 |tee unit-test-$TEST_OUTPUT
echo
# only unit test are run?
if [ $UNIT_TESTS_ONLY -eq 1 ]
then
exit 0
fi
# Step 2b - System Tests
sh ssl-opt.sh |tee sys-test-$TEST_OUTPUT
echo