From 188fafc42db06161a1e1a39591b0d20cc083c5dc Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Wed, 18 Dec 2013 18:40:43 +0000 Subject: cmdtests: Take into account new constructed artifacts --- tests.build/build-system-python-distutils.script | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'tests.build/build-system-python-distutils.script') diff --git a/tests.build/build-system-python-distutils.script b/tests.build/build-system-python-distutils.script index a0469528..e1dccb4b 100755 --- a/tests.build/build-system-python-distutils.script +++ b/tests.build/build-system-python-distutils.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2011-2013 Codethink Limited +# Copyright (C) 2011-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -79,10 +79,8 @@ git commit -q -m "Set custom install prefix for hello" for chunk in "$DATADIR/cache/artifacts/"*.chunk.* do - echo "$chunk:" | sed 's/[^.]*//' - tar -tf "$chunk" | LC_ALL=C sort | sed '/^\.\/./s:^\./::' - echo -done | + tar -tf "$chunk" +done | LC_ALL=C sort -u | sed '/^\.\/./s:^\./::' | grep -Ee '^(bin|lib)' | sed -e 's:^local/::' \ -e 's:lib/python2.[6-9]/:lib/python2.x/:' \ -e 's:/hello-0\.0\.0[^/]*\.egg-info$:/hello.egg-info/:' \ -- cgit v1.2.1