From: Richard Levitte Date: Tue, 18 Feb 2020 07:25:06 +0000 (+0100) Subject: Replace util/shlib_wrap.sh with util/wrap.pl in diverse docs X-Git-Tag: openssl-3.0.0-alpha1~364 X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=30a4cda5e0c67b4e77da4f21b7c5f27991d3367a;hp=c3845ceba84aab9ddeb43f043549238fd10de63b Replace util/shlib_wrap.sh with util/wrap.pl in diverse docs Reviewed-by: Matthias St. Pierre (Merged from https://github.com/openssl/openssl/pull/11110) --- diff --git a/INSTALL.md b/INSTALL.md index 01726a16ab..8eefeb306d 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1545,7 +1545,7 @@ Run all tests in test groups 80 to 99 except for tests in group 90: To stochastically verify that the algorithm that produces uniformly distributed random numbers is operating correctly (with a false positive rate of 0.01%): - $ ./util/shlib_wrap.sh test/bntest -stochastic + $ ./util/wrap.sh test/bntest -stochastic Troubleshooting =============== diff --git a/NOTES.VALGRIND b/NOTES.VALGRIND index f128927c1a..afbb71e4ae 100644 --- a/NOTES.VALGRIND +++ b/NOTES.VALGRIND @@ -28,11 +28,11 @@ Test behavior can be modified by adjusting environment variables. EXE_SHELL This variable is used to specify the shell used to execute OpenSSL test -programs. The default program (util/shlib_wrap.sh) initializes the -environment to allow programs to find shared libraries. The variable can -be modified to specify a different executable environment. +programs. The default wrapper (util/wrap.pl) initializes the environment +to allow programs to find shared libraries. The variable can be modified +to specify a different executable environment. - EXE_SHELL="`/bin/pwd`/util/shlib_wrap.sh valgrind --error-exitcode=1 --leak-check=full -q" + EXE_SHELL="`/bin/pwd`/util/wrap.pl valgrind --error-exitcode=1 --leak-check=full -q" This will start up Valgrind with the default checker (memcheck). The --error-exitcode=1 option specifies that Valgrind should exit with an @@ -62,9 +62,9 @@ INSTALL file in the root of the OpenSSL source tree. Example command line: - make test EXE_SHELL="`/bin/pwd`/util/shlib_wrap.sh valgrind --error-exitcode=1 --leak-check=full -q" OPENSSL_ia32cap=":0" + make test EXE_SHELL="`/bin/pwd`/util/wrap.pl valgrind --error-exitcode=1 --leak-check=full -q" OPENSSL_ia32cap=":0" If an error occurs, you can then run the specific test via the TESTS variable with the VERBOSE option to gather additional information. - make test VERBOSE=1 TESTS=test_test EXE_SHELL="`/bin/pwd`/util/shlib_wrap.sh valgrind --error-exitcode=1 --leak-check=full -q" OPENSSL_ia32cap=":0" + make test VERBOSE=1 TESTS=test_test EXE_SHELL="`/bin/pwd`/util/wrap.pl valgrind --error-exitcode=1 --leak-check=full -q" OPENSSL_ia32cap=":0" diff --git a/test/README.ssltest.md b/test/README.ssltest.md index 3b4bb564f1..30360f7652 100644 --- a/test/README.ssltest.md +++ b/test/README.ssltest.md @@ -281,7 +281,7 @@ or for shared builds ``` $ CTLOG_FILE=test/ct/log_list.conf TEST_CERTS_DIR=test/certs \ - util/shlib_wrap.sh test/ssl_test test/ssl-tests/01-simple.conf + util/wrap.pl test/ssl_test test/ssl-tests/01-simple.conf ``` Note that the test expectations sometimes depend on the Configure settings. For