Import OpenSSL 1.1.1f
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
# Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
|
||||
# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the OpenSSL license (the "License"). You may not use
|
||||
# this file except in compliance with the License. You can obtain a copy
|
||||
@@ -65,7 +65,7 @@ use File::Spec::Functions qw/file_name_is_absolute curdir canonpath splitdir
|
||||
rel2abs/;
|
||||
use File::Path 2.00 qw/rmtree mkpath/;
|
||||
use File::Basename;
|
||||
use Cwd qw/abs_path/;
|
||||
use Cwd qw/getcwd abs_path/;
|
||||
|
||||
my $level = 0;
|
||||
|
||||
@@ -904,26 +904,26 @@ sub __srctop_file {
|
||||
BAIL_OUT("Must run setup() first") if (! $test_name);
|
||||
|
||||
my $f = pop;
|
||||
return catfile($directories{SRCTOP},@_,$f);
|
||||
return abs2rel(catfile($directories{SRCTOP},@_,$f),getcwd);
|
||||
}
|
||||
|
||||
sub __srctop_dir {
|
||||
BAIL_OUT("Must run setup() first") if (! $test_name);
|
||||
|
||||
return catdir($directories{SRCTOP},@_);
|
||||
return abs2rel(catdir($directories{SRCTOP},@_), getcwd);
|
||||
}
|
||||
|
||||
sub __bldtop_file {
|
||||
BAIL_OUT("Must run setup() first") if (! $test_name);
|
||||
|
||||
my $f = pop;
|
||||
return catfile($directories{BLDTOP},@_,$f);
|
||||
return abs2rel(catfile($directories{BLDTOP},@_,$f), getcwd);
|
||||
}
|
||||
|
||||
sub __bldtop_dir {
|
||||
BAIL_OUT("Must run setup() first") if (! $test_name);
|
||||
|
||||
return catdir($directories{BLDTOP},@_);
|
||||
return abs2rel(catdir($directories{BLDTOP},@_), getcwd);
|
||||
}
|
||||
|
||||
# __exeext is a function that returns the platform dependent file extension
|
||||
|
||||
Reference in New Issue
Block a user