mirror of https://github.com/openssl/openssl.git
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)
(cherry picked from commit 473664aafd
)
This commit is contained in:
parent
a0bbd4be5a
commit
d24b979dbf
|
@ -17,8 +17,8 @@ jobs:
|
||||||
# fips: set to "no" to disable building FIPS, leave unset to
|
# fips: set to "no" to disable building FIPS, leave unset to
|
||||||
# build the FIPS provider.
|
# build the FIPS provider.
|
||||||
# tests: omit this to run all the tests using QEMU, set it to "none"
|
# 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
|
# to never run the tests, otherwise its value is passed to
|
||||||
# the "make test" command to allow selectiving disabling of
|
# the "make test" command to allow selective disabling of
|
||||||
# tests.
|
# tests.
|
||||||
platform: [
|
platform: [
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
# Jobs run per pull request submission
|
# Jobs run per pull request submission
|
||||||
name: Run-checker CI
|
name: Run-checker CI
|
||||||
on: [pull_request, push]
|
on: [pull_request, push]
|
||||||
|
|
|
@ -4,4 +4,3 @@ Acknowlegements
|
||||||
Please see our [Thanks!][] page for the current acknowledgements.
|
Please see our [Thanks!][] page for the current acknowledgements.
|
||||||
|
|
||||||
[Thanks!]: https://www.openssl.org/community/thanks.html
|
[Thanks!]: https://www.openssl.org/community/thanks.html
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#! /usr/bin/perl
|
#! /usr/bin/env perl
|
||||||
|
|
||||||
use Config;
|
use Config;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#! /usr/bin/perl
|
#! /usr/bin/env perl
|
||||||
|
|
||||||
use Config;
|
use Config;
|
||||||
|
|
||||||
|
|
|
@ -296,7 +296,7 @@ API Level
|
||||||
Build the OpenSSL libraries to support the API for the specified version.
|
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
|
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,
|
for deprecated APIs in or below the specified version number. For example,
|
||||||
addding
|
adding
|
||||||
|
|
||||||
--api=1.1.0 no-deprecated
|
--api=1.1.0 no-deprecated
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#! /usr/bin/perl
|
#! /usr/bin/env perl
|
||||||
|
|
||||||
BEGIN { my $prev }
|
BEGIN { my $prev }
|
||||||
($_ = $prev) =~ s|^( *)(.*)$|"$1" . '=' x length($2)|e
|
($_ = $prev) =~ s|^( *)(.*)$|"$1" . '=' x length($2)|e
|
||||||
|
|
|
@ -199,4 +199,3 @@ next_release_state () {
|
||||||
$DEBUG >&2 "DEBUG[next_release_state]: END: \$RELEASE_DATE=$RELEASE_DATE"
|
$DEBUG >&2 "DEBUG[next_release_state]: END: \$RELEASE_DATE=$RELEASE_DATE"
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -471,7 +471,7 @@ for fixup in "$HERE/dev/release-aux"/fixup-*-postrelease.pl; do
|
||||||
perl -pi $fixup $file
|
perl -pi $fixup $file
|
||||||
done
|
done
|
||||||
|
|
||||||
$VERBOSE "== Comitting updates"
|
$VERBOSE "== Committing updates"
|
||||||
git add -u
|
git add -u
|
||||||
git commit $git_quiet -m "Prepare for $release_text"
|
git commit $git_quiet -m "Prepare for $release_text"
|
||||||
if [ -n "$reviewers" ]; then
|
if [ -n "$reviewers" ]; then
|
||||||
|
@ -502,7 +502,7 @@ if $do_branch; then
|
||||||
perl -pi $fixup $file
|
perl -pi $fixup $file
|
||||||
done
|
done
|
||||||
|
|
||||||
$VERBOSE "== Comitting updates"
|
$VERBOSE "== Committing updates"
|
||||||
git add -u
|
git add -u
|
||||||
git commit $git_quiet -m "Prepare for $release_text"
|
git commit $git_quiet -m "Prepare for $release_text"
|
||||||
if [ -n "$reviewers" ]; then
|
if [ -n "$reviewers" ]; then
|
||||||
|
|
|
@ -44,7 +44,7 @@ A recipe that just runs a test executable
|
||||||
|
|
||||||
A script that just runs a program looks like this:
|
A script that just runs a program looks like this:
|
||||||
|
|
||||||
#! /usr/bin/perl
|
#! /usr/bin/env perl
|
||||||
|
|
||||||
use OpenSSL::Test::Simple;
|
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:
|
A script to start from could be this:
|
||||||
|
|
||||||
#! /usr/bin/perl
|
#! /usr/bin/env perl
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#! /usr/bin/perl
|
#! /usr/bin/env perl
|
||||||
|
|
||||||
# Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
|
# Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#! /usr/bin/perl
|
#! /usr/bin/env perl
|
||||||
|
|
||||||
# Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
|
# Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#! /usr/bin/perl
|
#! /usr/bin/env perl
|
||||||
#
|
#
|
||||||
# Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
|
# Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#! /usr/bin/perl
|
#! /usr/bin/env perl
|
||||||
#
|
#
|
||||||
# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
|
# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#! /usr/bin/perl
|
#! /usr/bin/env perl
|
||||||
#
|
#
|
||||||
# Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
|
# Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
# Copyright 2017 BaishanCloud. All rights reserved.
|
# Copyright 2017 BaishanCloud. All rights reserved.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#! /usr/bin/perl
|
#! /usr/bin/env perl
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/perl
|
#! /usr/bin/env perl
|
||||||
#
|
#
|
||||||
# Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
|
# Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
# Copyright Siemens AG 2019-2020
|
# Copyright Siemens AG 2019-2020
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#! /usr/bin/perl
|
#! /usr/bin/env perl
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#! /usr/bin/perl
|
#! /usr/bin/env perl
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
|
|
Loading…
Reference in New Issue