Browse Source

always use the same perl in $PATH

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 <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16362)
a1346054 2 years ago
parent
commit
473664aafd

+ 2 - 2
.github/ISSUE_TEMPLATE.md

@@ -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
 
@@ -18,7 +18,7 @@ output and code, like this:
 
     ```
     #include <stdio.h>
-    
+
     int main() {
         int foo = 1;
         printf("%d\n", foo);

+ 2 - 2
.github/ISSUE_TEMPLATE/bug_report.md

@@ -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
 
@@ -44,7 +44,7 @@ output and code, like this:
 
     ```
     #include <stdio.h>
-    
+
     int main() {
         int foo = 1;
         printf("%d\n", foo);

+ 2 - 2
.github/ISSUE_TEMPLATE/feature_request.md

@@ -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
 
@@ -25,7 +25,7 @@ output and code, like this:
 
     ```
     #include <stdio.h>
-    
+
     int main() {
         int foo = 1;
         printf("%d\n", foo);

+ 2 - 2
.github/workflows/cross-compiles.yml

@@ -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: [
           {

+ 0 - 1
.github/workflows/run-checker-ci.yml

@@ -1,4 +1,3 @@
-
 # Jobs run per pull request submission
 name: Run-checker CI
 on: [pull_request, push]

+ 0 - 1
ACKNOWLEDGEMENTS.md

@@ -4,4 +4,3 @@ Acknowlegements
 Please see our [Thanks!][] page for the current acknowledgements.
 
 [Thanks!]: https://www.openssl.org/community/thanks.html
-

+ 1 - 1
Configurations/unix-checker.pm

@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 
 use Config;
 

+ 1 - 1
Configurations/windows-checker.pm

@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 
 use Config;
 

+ 1 - 1
INSTALL.md

@@ -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
 

+ 1 - 1
dev/release-aux/fix-title.pl

@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 
 BEGIN { my $prev }
 ($_ = $prev) =~ s|^( *)(.*)$|"$1" . '=' x length($2)|e

+ 1 - 2
dev/release-aux/release-state-fn.sh

@@ -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"
@@ -199,4 +199,3 @@ next_release_state () {
         $DEBUG >&2 "DEBUG[next_release_state]: END: \$RELEASE_DATE=$RELEASE_DATE"
     done
 }
-

+ 2 - 2
dev/release.sh

@@ -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
@@ -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

+ 2 - 2
test/README-dev.md

@@ -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;
 
@@ -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;

+ 2 - 2
test/recipes/06-test_algorithmid.t

@@ -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

+ 2 - 2
test/recipes/06-test_rdrand_sanity.t

@@ -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

+ 1 - 1
test/recipes/80-test_cipherbytes.t

@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 #
 # Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
 #

+ 1 - 1
test/recipes/80-test_cipherlist.t

@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 #
 # Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
 #

+ 1 - 1
test/recipes/80-test_ciphername.t

@@ -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.

+ 1 - 1
test/recipes/90-test_includes.t

@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 
 use strict;
 use warnings;

+ 1 - 1
util/check-format.pl

@@ -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

+ 1 - 1
util/echo.pl

@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 
 use strict;
 use warnings;

+ 2 - 2
util/fips-checksums.sh

@@ -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 \

+ 1 - 1
util/fix-deprecation

@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 
 use strict;
 use warnings;