configure: test for functional readline more carefully

[bup.git] / t / ns-timestamp-resolutions

diff --git a/t/ns-timestamp-resolutions b/t/ns-timestamp-resolutions
index f8ac60d814aa3a3a3383465de8c12bfb544414a8..d1387495272b9912d494c29c62d15fa115cccdaa 100755 (executable)
--- a/t/ns-timestamp-resolutions
+++ b/t/ns-timestamp-resolutions
@@ -1,16 +1,28 @@
 #!/bin/sh
 """": # -*-python-*-
-bup_python="$(dirname "$0")/../cmd/bup-python" || exit $?
-exec "$bup_python" "$0" ${1+"$@"}
+# https://sourceware.org/bugzilla/show_bug.cgi?id=26034
+export "BUP_ARGV_0"="$0"
+arg_i=1
+for arg in "$@"; do
+    export "BUP_ARGV_${arg_i}"="$arg"
+    shift
+    arg_i=$((arg_i + 1))
+done
+bup_python="$(dirname "$0")/../dev/bup-python" || exit $?
+exec "$bup_python" "$0"
 """
 # end of bup preamble
 
 from __future__ import absolute_import
-import os, sys
+import os.path, sys
 
-import bup.xstat as xstat
+sys.path[:0] = [os.path.dirname(os.path.realpath(__file__)) + '/../lib']
+
+from bup.compat import argv_bytes
 from bup.helpers import handle_ctrl_c, saved_errors
-from bup import metadata, options
+from bup.io import byte_stream
+from bup import compat, metadata, options
+import bup.xstat as xstat
 
 
 optspec = """
@@ -21,12 +33,15 @@ ns-timestamp-resolutions TEST_FILE_NAME
 handle_ctrl_c()
 
 o = options.Options(optspec)
-(opt, flags, extra) = o.parse(sys.argv[1:])
+opt, flags, extra = o.parse(compat.argv[1:])
+
+sys.stdout.flush()
+out = byte_stream(sys.stdout)
 
 if len(extra) != 1:
     o.fatal('must specify a test file name')
 
-target = extra[0]
+target = argv_bytes(extra[0])
 
 open(target, 'w').close()
 xstat.utime(target, (123456789, 123456789))
@@ -39,7 +54,8 @@ def ns_resolution(x):
         n *= 10
     return n
 
-print ns_resolution(meta.atime), ns_resolution(meta.mtime)
+out.write(b'%d %d\n' % (ns_resolution(meta.atime),
+                        ns_resolution(meta.mtime)))
 
 if saved_errors:
     log('warning: %d errors encountered\n' % len(saved_errors))