diff options
| author | Ladar Levison <ladar@lavabit.com> | 2019-01-24 17:05:02 +0300 |
|---|---|---|
| committer | Ladar Levison <ladar@lavabit.com> | 2019-01-24 17:05:02 +0300 |
| commit | 72e23144cbabe10cf956cf4a9292e540b75b80e8 (patch) | |
| tree | a038f9eadfc93799b6c2808fda2a22c8705a71c9 | |
| parent | 90ed7e25a1c029bad9bb854086ac1641c1608a05 (diff) | |
Needed to tweak runtests.pl for compatibility.
| -rwxr-xr-x | dev/scripts/builders/build.lib.sh | 1 | ||||
| -rw-r--r-- | lib/patches/curl/7.23.1_curl_exec_perm_fix.patch | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/dev/scripts/builders/build.lib.sh b/dev/scripts/builders/build.lib.sh index d8c50ec6..f11a3a5c 100755 --- a/dev/scripts/builders/build.lib.sh +++ b/dev/scripts/builders/build.lib.sh @@ -607,6 +607,7 @@ curl() { curl-prep) cd "$M_SOURCES/curl"; error cat "$M_PATCHES/curl/"skip_test172-version7.23.1.patch | patch -p1 --verbose &>> "$M_LOGS/curl.txt"; error + cat "$M_PATCHES/curl/"7.23.1_curl_exec_perm_fix.patch | patch -p1 --verbose &>> "$M_LOGS/curl.txt"; error ;; curl-build) # Note that if we don't include the debug configure option we can't run a check-full. diff --git a/lib/patches/curl/7.23.1_curl_exec_perm_fix.patch b/lib/patches/curl/7.23.1_curl_exec_perm_fix.patch new file mode 100644 index 00000000..05367c22 --- /dev/null +++ b/lib/patches/curl/7.23.1_curl_exec_perm_fix.patch @@ -0,0 +1,13 @@ +diff --git a/tests/runtests.pl b/tests/runtests.pl +index 54eb539..319f56c 100755 +--- a/tests/runtests.pl ++++ b/tests/runtests.pl +@@ -3012,7 +3012,7 @@ sub singletest { + if($cmdtype eq "perl") { + # run the command line prepended with "perl" + $cmdargs ="$cmd"; +- $CMDLINE = "perl "; ++ $CMDLINE = "perl -I. "; + $tool=$CMDLINE; + $disablevalgrind=1; + } |