Replace util/shlib_wrap.sh with util/wrap.pl in diverse docs

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/11110)

diff --git a/INSTALL.md b/INSTALL.md
index 01726a16ab944a277be2544afe393b40bb739cb6..8eefeb306d0d8d83abef78e146780db5cbf19f4f 100644 (file)
--- 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%):
 
 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
 ===============
 
 Troubleshooting
 ===============

diff --git a/NOTES.VALGRIND b/NOTES.VALGRIND
index f128927c1a24be6d186e2b5b12b28387551bbdbf..afbb71e4aefde2109938a33de2e9d1e039bfcdee 100644 (file)
--- 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
 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
 
 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:
 
 
 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.
 
 
 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 3b4bb564f11e6d7a168c7fe9d7a91392ec9ce130..30360f7652a8c7170e7344d5404fd9a954576bff 100644 (file)
--- 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 \
 
 ```
 $ 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
 ```
 
 Note that the test expectations sometimes depend on the Configure settings. For