Major updates integration from all upstreams

qa/zcash/create_benchmark_archive.py

@@ -5,7 +5,6 @@ import plyvel
 import progressbar
 import os
 import stat
-import struct
 import subprocess
 import sys
 import tarfile

qa/zcash/full_test_suite.py

@@ -4,6 +4,7 @@
 #
 
 import argparse
+from glob import glob
 import os
 import re
 import subprocess
@@ -62,12 +63,18 @@ def check_security_hardening():
     # PIE, RELRO, Canary, and NX are tested by make check-security.
     ret &= subprocess.call(['make', '-C', repofile('src'), 'check-security']) == 0
 
+    # The remaining checks are only for ELF binaries
+    # Assume that if zcashd is an ELF binary, they all are
+    with open(repofile('src/zcashd'), 'rb') as f:
+        magic = f.read(4)
+        if not magic.startswith(b'\x7fELF'):
+            return ret
+
     ret &= test_rpath_runpath('src/zcashd')
     ret &= test_rpath_runpath('src/zcash-cli')
     ret &= test_rpath_runpath('src/zcash-gtest')
     ret &= test_rpath_runpath('src/zcash-tx')
     ret &= test_rpath_runpath('src/test/test_bitcoin')
-    ret &= test_rpath_runpath('src/zcash/GenerateParams')
 
     # NOTE: checksec.sh does not reliably determine whether FORTIFY_SOURCE
     # is enabled for the entire binary. See issue #915.
@@ -76,16 +83,18 @@ def check_security_hardening():
     ret &= test_fortify_source('src/zcash-gtest')
     ret &= test_fortify_source('src/zcash-tx')
     ret &= test_fortify_source('src/test/test_bitcoin')
-    ret &= test_fortify_source('src/zcash/GenerateParams')
 
     return ret
 
 def ensure_no_dot_so_in_depends():
-    arch_dir = os.path.join(
-        REPOROOT,
-        'depends',
-        'x86_64-unknown-linux-gnu',
-    )
+    depends_dir = os.path.join(REPOROOT, 'depends')
+    arch_dir = os.path.join(depends_dir, 'x86_64-unknown-linux-gnu')
+    if not os.path.isdir(arch_dir):
+        # Not Linux, try MacOS
+        arch_dirs = glob(os.path.join(depends_dir, 'x86_64-apple-darwin*'))
+        if arch_dirs:
+            # Just try the first one; there will only be on in CI
+            arch_dir = arch_dirs[0]
 
     exit_code = 0
 
@@ -99,7 +108,7 @@ def ensure_no_dot_so_in_depends():
                 exit_code = 1
     else:
         exit_code = 2
-        print "arch-specific build dir not present: {}".format(arch_dir)
+        print "arch-specific build dir not present"
         print "Did you build the ./depends tree?"
         print "Are you on a currently unsupported architecture?"