Skip to content

Commit 30a4cda

Browse files
committed
Replace util/shlib_wrap.sh with util/wrap.pl in diverse docs
Reviewed-by: Matthias St. Pierre <[email protected]> (Merged from openssl#11110)
1 parent c3845ce commit 30a4cda

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

INSTALL.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1545,7 +1545,7 @@ Run all tests in test groups 80 to 99 except for tests in group 90:
15451545
To stochastically verify that the algorithm that produces uniformly distributed
15461546
random numbers is operating correctly (with a false positive rate of 0.01%):
15471547

1548-
$ ./util/shlib_wrap.sh test/bntest -stochastic
1548+
$ ./util/wrap.sh test/bntest -stochastic
15491549

15501550
Troubleshooting
15511551
===============

NOTES.VALGRIND

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ Test behavior can be modified by adjusting environment variables.
2828
EXE_SHELL
2929

3030
This variable is used to specify the shell used to execute OpenSSL test
31-
programs. The default program (util/shlib_wrap.sh) initializes the
32-
environment to allow programs to find shared libraries. The variable can
33-
be modified to specify a different executable environment.
31+
programs. The default wrapper (util/wrap.pl) initializes the environment
32+
to allow programs to find shared libraries. The variable can be modified
33+
to specify a different executable environment.
3434

35-
EXE_SHELL="`/bin/pwd`/util/shlib_wrap.sh valgrind --error-exitcode=1 --leak-check=full -q"
35+
EXE_SHELL="`/bin/pwd`/util/wrap.pl valgrind --error-exitcode=1 --leak-check=full -q"
3636

3737
This will start up Valgrind with the default checker (memcheck).
3838
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.
6262

6363
Example command line:
6464

65-
make test EXE_SHELL="`/bin/pwd`/util/shlib_wrap.sh valgrind --error-exitcode=1 --leak-check=full -q" OPENSSL_ia32cap=":0"
65+
make test EXE_SHELL="`/bin/pwd`/util/wrap.pl valgrind --error-exitcode=1 --leak-check=full -q" OPENSSL_ia32cap=":0"
6666

6767
If an error occurs, you can then run the specific test via the TESTS
6868
variable with the VERBOSE option to gather additional information.
6969

70-
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"
70+
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"

test/README.ssltest.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ or for shared builds
281281

282282
```
283283
$ CTLOG_FILE=test/ct/log_list.conf TEST_CERTS_DIR=test/certs \
284-
util/shlib_wrap.sh test/ssl_test test/ssl-tests/01-simple.conf
284+
util/wrap.pl test/ssl_test test/ssl-tests/01-simple.conf
285285
```
286286

287287
Note that the test expectations sometimes depend on the Configure settings. For

0 commit comments

Comments
 (0)