From 21954744ce1e1b17c26f5a1e8f04ceeb048ae033 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Mon, 23 Apr 2012 16:34:23 +0100 Subject: Normalize test output for build-system.python-distutils test The output otherwise differs between various Linux distros, with differnet distutils settings and Python versions. --- tests/build-system-python-distutils.script | 6 +++++- tests/build-system-python-distutils.stdout | 7 +++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/build-system-python-distutils.script b/tests/build-system-python-distutils.script index 2c7c7df6..49ab98ce 100755 --- a/tests/build-system-python-distutils.script +++ b/tests/build-system-python-distutils.script @@ -58,4 +58,8 @@ do echo "$chunk:" | sed 's/[^.]*//' tar -tf "$chunk" | LC_ALL=C sort | sed '/^\.\/./s:^\./::' echo -done +done | +sed -e 's:^local/::' \ + -e 's:lib/python2.[6-9]/:lib/python2.x/:' \ + -e 's:/hello-0\.0\.0[^/]*\.egg-info$:/hello.egg-info/:' \ + -e '/^$/d' diff --git a/tests/build-system-python-distutils.stdout b/tests/build-system-python-distutils.stdout index b78b608f..85a625db 100644 --- a/tests/build-system-python-distutils.stdout +++ b/tests/build-system-python-distutils.stdout @@ -5,7 +5,6 @@ baserock/hello.meta bin/ bin/hello lib/ -lib/python2.7/ -lib/python2.7/site-packages/ -lib/python2.7/site-packages/hello-0.0.0-py2.7.egg-info - +lib/python2.x/ +lib/python2.x/dist-packages/ +lib/python2.x/dist-packages/hello.egg-info/ -- cgit v1.2.1