Changeset: 81ac23d044f0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=81ac23d044f0
Added Files:
sql/test/Tests/bincopycollist-prepare.py
Removed Files:
sql/test/Tests/bincopycollist-prepare.bat
sql/test/Tests/bincopycollist-prepare.sh
sql/test/Tests/bincopyint.bin
Modified Files:
sql/test/Tests/bincopycollist-prepare.stable.err
sql/test/Tests/bincopycollist-prepare.stable.out
Branch: Dec2016
Log Message:
Create binary data on the fly in the correct format.
This way the test should also work correctly on big-endian systems.
diffs (92 lines):
diff --git a/sql/test/Tests/bincopycollist-prepare.bat
b/sql/test/Tests/bincopycollist-prepare.bat
deleted file mode 100755
--- a/sql/test/Tests/bincopycollist-prepare.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@prompt # $t $g
-@echo on
-
-copy "%TSTSRCDIR%\bincopyint.bin" "%TSTTRGDIR%"
diff --git a/sql/test/Tests/bincopycollist-prepare.py
b/sql/test/Tests/bincopycollist-prepare.py
new file mode 100644
--- /dev/null
+++ b/sql/test/Tests/bincopycollist-prepare.py
@@ -0,0 +1,9 @@
+import struct
+import os
+
+f = open(os.path.join(os.getenv('TSTTRGDIR'), 'bincopyint.bin'), 'wb')
+
+for i in range(10):
+ f.write(struct.pack('@i', i))
+
+f.close()
diff --git a/sql/test/Tests/bincopycollist-prepare.sh
b/sql/test/Tests/bincopycollist-prepare.sh
deleted file mode 100755
--- a/sql/test/Tests/bincopycollist-prepare.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-Mlog -x "cp $TSTSRCDIR/bincopyint.bin $TSTTRGDIR"
diff --git a/sql/test/Tests/bincopycollist-prepare.stable.err
b/sql/test/Tests/bincopycollist-prepare.stable.err
--- a/sql/test/Tests/bincopycollist-prepare.stable.err
+++ b/sql/test/Tests/bincopycollist-prepare.stable.err
@@ -1,17 +1,12 @@
stderr of test 'bincopycollist-prepare` in directory 'sql/test` itself:
-# 17:03:22 >
-# 17:03:22 > "./bincopycollist-prepare.sh" "bincopycollist-prepare"
-# 17:03:22 >
+# 10:50:00 >
+# 10:50:00 > "/usr/bin/python2" "bincopycollist-prepare.py"
"bincopycollist-prepare"
+# 10:50:00 >
-# 17:03:22 >
-# 17:03:22 > cp /Users/myth/Programs/MonetDB/sql/test/Tests/bincopyint.bin
/Users/myth/opt/mTests/sql/test
-# 17:03:22 >
+# 10:50:00 >
+# 10:50:00 > "Done."
+# 10:50:00 >
-
-# 17:03:22 >
-# 17:03:22 > "Done."
-# 17:03:22 >
-
diff --git a/sql/test/Tests/bincopycollist-prepare.stable.out
b/sql/test/Tests/bincopycollist-prepare.stable.out
--- a/sql/test/Tests/bincopycollist-prepare.stable.out
+++ b/sql/test/Tests/bincopycollist-prepare.stable.out
@@ -1,17 +1,12 @@
stdout of test 'bincopycollist-prepare` in directory 'sql/test` itself:
-# 17:03:22 >
-# 17:03:22 > "./bincopycollist-prepare.sh" "bincopycollist-prepare"
-# 17:03:22 >
+# 10:50:00 >
+# 10:50:00 > "/usr/bin/python2" "bincopycollist-prepare.py"
"bincopycollist-prepare"
+# 10:50:00 >
-# 17:03:22 >
-# 17:03:22 > cp /Users/myth/Programs/MonetDB/sql/test/Tests/bincopyint.bin
/Users/myth/opt/mTests/sql/test
-# 17:03:22 >
+# 10:50:00 >
+# 10:50:00 > "Done."
+# 10:50:00 >
-
-# 17:03:22 >
-# 17:03:22 > "Done."
-# 17:03:22 >
-
diff --git a/sql/test/Tests/bincopyint.bin b/sql/test/Tests/bincopyint.bin
deleted file mode 100644
index
2c6aacdecdc212596c5e82ae940eaaa7de2f9437..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
