[reprotest] 01/01: Preserve directory structure when copying artifacts

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository reprotest.

commit e08cf2d88f63bd3f066080092eb8d2ce74dd7a38
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Mar 31 18:43:45 2017 -0400

    Preserve directory structure when copying artifacts
    
    Otherwise `find` can't find the artifacts, to calculate their hashes
---
 debian/changelog      |  8 ++++++++
 reprotest/__init__.py | 18 +++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b02ee30..a53868b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+reprotest (0.7) UNRELEASED; urgency=medium
+
+  * Preserve directory structure when copying artifacts. Otherwise hash output
+    on a succesful reproduction sometimes fails, because find(1) can't find
+    the artifacts using the original artifact_pattern.
+
+ -- Ximin Luo <infinity0 at debian.org>  Wed, 05 Apr 2017 04:11:34 +0200
+
 reprotest (0.6) unstable; urgency=medium
 
   * When a reproduction succeeds, only output hashes of the artifacts rather
diff --git a/reprotest/__init__.py b/reprotest/__init__.py
index 766b097..1ede046 100644
--- a/reprotest/__init__.py
+++ b/reprotest/__init__.py
@@ -192,6 +192,9 @@ def basename(p):
     # works more intuitively for paths with a trailing /
     return os.path.normpath(os.path.basename(os.path.normpath(p)))
 
+# put build artifacts in ${dist}/source-root, to support tools that put artifacts in ..
+VSRC_DIR = "source-root"
+
 
 # time zone, locales, disorderfs, host name, user/group, shell, CPU
 # number, architecture for uname (using linux64), umask, HOME, see
@@ -359,7 +362,7 @@ VARIATIONS = types.MappingProxyType(collections.OrderedDict([
 ]))
 
 
-def build(script, env, source_root_orig, source_root_build, dist_root, artifact_store, artifact_pattern, testbed):
+def build(script, env, source_root_orig, source_root_build, dist_root, artifact_pattern, testbed):
     logging.info("starting build with source directory: %s, artifact pattern: %s",
         source_root_orig, artifact_pattern)
     # remove any existing artifact, in case the build script doesn't overwrite
@@ -376,11 +379,12 @@ def build(script, env, source_root_orig, source_root_build, dist_root, artifact_
     (code, _, _) = testbed.execute(argv, xenv=xenv, kind='build')
     if code != 0:
         testbed.bomb('"%s" failed with status %i' % (' '.join(argv), code), adtlog.AutopkgtestError)
-    # exit_code, stdout, stderr = testbed.execute(['lsof', source_root], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    # print(exit_code, stdout, stderr)
+    dist_base = os.path.join(dist_root, VSRC_DIR)
     testbed.check_exec(
-        ['sh', '-ec', 'mkdir -p "%s" && cd "%s" && cp -a -t "%s" %s && touch -d at 0 "%s" "%s"/*' %
-        (dist_root, source_root_orig, dist_root, artifact_pattern, dist_root, dist_root)])
+        ['sh', '-ec', """mkdir -p "{0}"
+cd "{1}" && cp --parents -a -t "{0}" {2}
+cd "{0}" && touch -d at 0 . .. {2}
+""".format(dist_base, source_root_orig, artifact_pattern)])
 
 
 def run_or_tee(progargs, filename, store_dir, *args, **kwargs):
@@ -455,7 +459,7 @@ def check(build_command, artifact_pattern, virtual_server_args, source_root,
                     testbed.command('copydown', (source_root, orig_tree[i]))
 
                 for i in (0, 1):
-                    build(script[i], env[i], orig_tree[i], tree[i], dist[i], result[i],
+                    build(script[i], env[i], orig_tree[i], tree[i], dist[i],
                           artifact_pattern, testbed)
 
                 for i in (0, 1):
@@ -484,7 +488,7 @@ def check(build_command, artifact_pattern, virtual_server_args, source_root,
             print("No differences in %s" % artifact_pattern, flush=True)
             run_or_tee(['sh', '-ec', 'find %s -type f -exec sha256sum "{}" \;' % artifact_pattern],
                 'SHA256SUMS', store_dir,
-                cwd=result.control)
+                cwd=os.path.join(result.control, VSRC_DIR))
 
             if store_dir:
                 shutil.rmtree(store.experiment)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/reprotest.git