Skip to content

Commit

Permalink
always use the same perl in $PATH
Browse files Browse the repository at this point in the history
Different tests may use unexpectedly different versions of perl,
depending on whether they hardcode the path to the perl executable or if
they resolve the path from the environment. This fixes it so that the
same perl is always used.

Fix some trailing whitespace and spelling mistakes as well.

CLA: trivial

Reviewed-by: Tomas Mraz <[email protected]>
Reviewed-by: Paul Dale <[email protected]>
(Merged from openssl#16362)
  • Loading branch information
a1346054 authored and paulidale committed Sep 2, 2021
1 parent 3a1fa01 commit 473664a
Show file tree
Hide file tree
Showing 23 changed files with 30 additions and 33 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
NOTE:
If you're asking about how to use OpenSSL, this isn't the right
If you're asking about how to use OpenSSL, this isn't the right
forum. Please see our User Support resources:
https://github.com/openssl/openssl/blob/master/SUPPORT.md
Expand All @@ -18,7 +18,7 @@ output and code, like this:
```
#include <stdio.h>
int main() {
int foo = 1;
printf("%d\n", foo);
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ please take the time to read the following lines before posting it.
NOTE:
If you're asking about how to use OpenSSL, this isn't the right
If you're asking about how to use OpenSSL, this isn't the right
forum. Please see our User Support resources:
https://github.com/openssl/openssl/blob/master/SUPPORT.md
Expand Down Expand Up @@ -44,7 +44,7 @@ output and code, like this:
```
#include <stdio.h>
int main() {
int foo = 1;
printf("%d\n", foo);
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ please take the time to read the following lines before posting it.
NOTE:
If you're asking about how to use OpenSSL, this isn't the right
If you're asking about how to use OpenSSL, this isn't the right
forum. Please see our User Support resources:
https://github.com/openssl/openssl/blob/master/SUPPORT.md
Expand All @@ -25,7 +25,7 @@ output and code, like this:
```
#include <stdio.h>
int main() {
int foo = 1;
printf("%d\n", foo);
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cross-compiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
# fips: set to "no" to disable building FIPS, leave unset to
# build the FIPS provider.
# tests: omit this to run all the tests using QEMU, set it to "none"
# to never run the tests, otherwise it's value is passed to
# the "make test" command to allow selectiving disabling of
# to never run the tests, otherwise its value is passed to
# the "make test" command to allow selective disabling of
# tests.
platform: [
{
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/run-checker-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# Jobs run per pull request submission
name: Run-checker CI
on: [pull_request, push]
Expand Down
1 change: 0 additions & 1 deletion ACKNOWLEDGEMENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ Acknowlegements
Please see our [Thanks!][] page for the current acknowledgements.

[Thanks!]: https://www.openssl.org/community/thanks.html

2 changes: 1 addition & 1 deletion Configurations/unix-checker.pm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/perl
#! /usr/bin/env perl

use Config;

Expand Down
2 changes: 1 addition & 1 deletion Configurations/windows-checker.pm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/perl
#! /usr/bin/env perl

use Config;

Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ API Level
Build the OpenSSL libraries to support the API for the specified version.
If [no-deprecated](#no-deprecated) is also given, don't build with support
for deprecated APIs in or below the specified version number. For example,
addding
adding

--api=1.1.0 no-deprecated

Expand Down
2 changes: 1 addition & 1 deletion dev/release-aux/fix-title.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/perl
#! /usr/bin/env perl

BEGIN { my $prev }
($_ = $prev) =~ s|^( *)(.*)$|"$1" . '=' x length($2)|e
Expand Down
3 changes: 1 addition & 2 deletions dev/release-aux/release-state-fn.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ next_release_state () {

case "$before+$next" in
# MAKING ALPHA RELEASES ##################################

# Alpha releases can't be made from beta versions or real versions
beta*+alpha | +alpha )
echo >&2 "Invalid state for an alpha release"
Expand Down Expand Up @@ -199,4 +199,3 @@ next_release_state () {
$DEBUG >&2 "DEBUG[next_release_state]: END: \$RELEASE_DATE=$RELEASE_DATE"
done
}

4 changes: 2 additions & 2 deletions dev/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ for fixup in "$HERE/dev/release-aux"/fixup-*-postrelease.pl; do
perl -pi $fixup $file
done

$VERBOSE "== Comitting updates"
$VERBOSE "== Committing updates"
git add -u
git commit $git_quiet -m "Prepare for $release_text"
if [ -n "$reviewers" ]; then
Expand Down Expand Up @@ -502,7 +502,7 @@ if $do_branch; then
perl -pi $fixup $file
done

$VERBOSE "== Comitting updates"
$VERBOSE "== Committing updates"
git add -u
git commit $git_quiet -m "Prepare for $release_text"
if [ -n "$reviewers" ]; then
Expand Down
4 changes: 2 additions & 2 deletions test/README-dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ A recipe that just runs a test executable

A script that just runs a program looks like this:

#! /usr/bin/perl
#! /usr/bin/env perl

use OpenSSL::Test::Simple;

Expand All @@ -67,7 +67,7 @@ documentation. For OpenSSL::Test, do `perldoc util/perl/OpenSSL/Test.pm`.

A script to start from could be this:

#! /usr/bin/perl
#! /usr/bin/env perl

use strict;
use warnings;
Expand Down
4 changes: 2 additions & 2 deletions test/recipes/06-test_algorithmid.t
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/perl
#! /usr/bin/env perl

# Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
#
#
# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
# in the file LICENSE in the source distribution or at
Expand Down
4 changes: 2 additions & 2 deletions test/recipes/06-test_rdrand_sanity.t
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/perl
#! /usr/bin/env perl

# Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
#
#
# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
# in the file LICENSE in the source distribution or at
Expand Down
2 changes: 1 addition & 1 deletion test/recipes/80-test_cipherbytes.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/perl
#! /usr/bin/env perl
#
# Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
#
Expand Down
2 changes: 1 addition & 1 deletion test/recipes/80-test_cipherlist.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/perl
#! /usr/bin/env perl
#
# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
#
Expand Down
2 changes: 1 addition & 1 deletion test/recipes/80-test_ciphername.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/perl
#! /usr/bin/env perl
#
# Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
# Copyright 2017 BaishanCloud. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion test/recipes/90-test_includes.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/perl
#! /usr/bin/env perl

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion util/check-format.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#! /usr/bin/env perl
#
# Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
# Copyright Siemens AG 2019-2020
Expand Down
2 changes: 1 addition & 1 deletion util/echo.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/perl
#! /usr/bin/env perl

use strict;
use warnings;
Expand Down
4 changes: 2 additions & 2 deletions util/fips-checksums.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ for f in "$@"; do
| openssl sha256 -r \
| sed -e "s| \\*stdin| $f|"
;;
*.pl )
*.pl )
cat "$f" \
| $HERE/lang-compress.pl 'perl' \
| openssl sha256 -r \
| sed -e "s| \\*stdin| $f|"
;;
*.S )
*.S )
cat "$f" \
| $HERE/lang-compress.pl 'S' \
| openssl sha256 -r \
Expand Down
2 changes: 1 addition & 1 deletion util/fix-deprecation
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/perl
#! /usr/bin/env perl

use strict;
use warnings;
Expand Down

0 comments on commit 473664a

Please sign in to comment.