From 51eaed7fb243a989fdf96461ba2d9acfc07977f8 Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Wed, 26 Nov 2014 09:59:25 +0100 Subject: Regression test portability: batch of bugs (volume 2) Fix various regression test portability in tests/bugs. bug-861542.t - Avoid syntax specific to GNU sed. bug-860663.t - Command argument length is system dependent, and specifying 1000 file path may overflow it. Use a C program to do the job in a portable and efficient way. - Add a test that we created the specified amount of files. bug-858242.c, bug-808400-fcntl.c, bug-808400-flock.c - fstat64() is Linux-specific. Define it as fstat for other systems. bug-823081.t - Use portable tail -n instead of tail --lines In many tests: - Do not assume python interpreter name. Use $PYTHON as defined in env.rc by configure. utils/libcxattr.py - If python version is 2.6 or higher, use a portable mechanism to recover errno. The original version is retained for python version 2.5 and earlier but it only works on Linux. BUG: 1129939 Change-Id: If2fea1ffec5cc6ab2de426fb200e884450afe61b Signed-off-by: Emmanuel Dreyfus Reviewed-on: http://review.gluster.org/9097 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- tests/bugs/bug-861542.t | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/bugs/bug-861542.t') diff --git a/tests/bugs/bug-861542.t b/tests/bugs/bug-861542.t index f4fd4e52a58..70fd12239e2 100755 --- a/tests/bugs/bug-861542.t +++ b/tests/bugs/bug-861542.t @@ -30,8 +30,7 @@ function xml_port_field() local opt=$2; $CLI --xml volume status $vol $opt | tr -d '\n' |\ #Find the first occurrence of the string between and - sed -r 's//&\n/;s/<\/port>/\n&/;s/^.*\n(.*)\n.*$/\1/'| \ - grep -v xml | tr -d '\n'; + sed -rn 's//&###/;s/<\/port>/###&/;s/^.*###(.*)###.*$/\1/p' } TEST $CLI volume status $V0; -- cgit