Changeset: 220b887e175c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=220b887e175c
Modified Files:
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py
sql/test/emptydb-upgrade-chain/Tests/upgrade.py
sql/test/emptydb-upgrade-hge/Tests/upgrade.py
sql/test/emptydb-upgrade/Tests/upgrade.py
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
sql/test/testdb-upgrade-chain/Tests/upgrade.py
sql/test/testdb-upgrade-hge/Tests/upgrade.py
sql/test/testdb-upgrade/Tests/upgrade.py
Branch: default
Log Message:
Use a more portable call to detect the CPU architecture
diffs (184 lines):
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py
@@ -9,9 +9,7 @@ try:
except ImportError:
import process
-import sys
-import os
-import zipfile
+import sys, os, zipfile, platform
xit = 0
@@ -50,7 +48,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
bits = ['.' + bits, '']
else:
bits = ['']
- arch = os.uname()[4]
+ arch = platform.machine()
arch = ['.' + arch, '']
hge = os.getenv('HAVE_HGE')
if hge:
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.py
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.py
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.py
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.py
@@ -9,9 +9,7 @@ try:
except ImportError:
import process
-import sys
-import os
-import zipfile
+import sys, os, zipfile, platform
xit = 0
@@ -50,7 +48,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
bits = ['.' + bits, '']
else:
bits = ['']
- arch = os.uname()[4]
+ arch = platform.machine()
arch = ['.' + arch, '']
hge = os.getenv('HAVE_HGE')
if hge:
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.py
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.py
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.py
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.py
@@ -9,9 +9,7 @@ try:
except ImportError:
import process
-import sys
-import os
-import zipfile
+import sys, os, zipfile, platform
xit = 0
@@ -50,7 +48,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
bits = ['.' + bits, '']
else:
bits = ['']
- arch = os.uname()[4]
+ arch = platform.machine()
arch = ['.' + arch, '']
hge = os.getenv('HAVE_HGE')
if hge:
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.py
b/sql/test/emptydb-upgrade/Tests/upgrade.py
--- a/sql/test/emptydb-upgrade/Tests/upgrade.py
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.py
@@ -9,9 +9,7 @@ try:
except ImportError:
import process
-import sys
-import os
-import zipfile
+import sys, os, zipfile, platform
xit = 0
@@ -50,7 +48,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
bits = ['.' + bits, '']
else:
bits = ['']
- arch = os.uname()[4]
+ arch = platform.machine()
arch = ['.' + arch, '']
hge = os.getenv('HAVE_HGE')
if hge:
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
@@ -9,9 +9,7 @@ try:
except ImportError:
import process
-import sys
-import os
-import zipfile
+import sys, os, zipfile, platform
xit = 0
@@ -51,7 +49,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
bits = ['.' + bits, '']
else:
bits = ['']
- arch = os.uname()[4]
+ arch = platform.machine()
arch = ['.' + arch, '']
hge = os.getenv('HAVE_HGE')
if hge:
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.py
b/sql/test/testdb-upgrade-chain/Tests/upgrade.py
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.py
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.py
@@ -9,9 +9,7 @@ try:
except ImportError:
import process
-import sys
-import os
-import zipfile
+import sys, os, zipfile, platform
xit = 0
@@ -51,7 +49,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
bits = ['.' + bits, '']
else:
bits = ['']
- arch = os.uname()[4]
+ arch = platform.machine()
arch = ['.' + arch, '']
hge = os.getenv('HAVE_HGE')
if hge:
diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.py
b/sql/test/testdb-upgrade-hge/Tests/upgrade.py
--- a/sql/test/testdb-upgrade-hge/Tests/upgrade.py
+++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.py
@@ -9,9 +9,7 @@ try:
except ImportError:
import process
-import sys
-import os
-import zipfile
+import sys, os, zipfile, platform
xit = 0
@@ -51,7 +49,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
bits = ['.' + bits, '']
else:
bits = ['']
- arch = os.uname()[4]
+ arch = platform.machine()
arch = ['.' + arch, '']
hge = os.getenv('HAVE_HGE')
if hge:
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.py
b/sql/test/testdb-upgrade/Tests/upgrade.py
--- a/sql/test/testdb-upgrade/Tests/upgrade.py
+++ b/sql/test/testdb-upgrade/Tests/upgrade.py
@@ -9,9 +9,7 @@ try:
except ImportError:
import process
-import sys
-import os
-import zipfile
+import sys, os, zipfile, platform
xit = 0
@@ -51,7 +49,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
bits = ['.' + bits, '']
else:
bits = ['']
- arch = os.uname()[4]
+ arch = platform.machine()
arch = ['.' + arch, '']
hge = os.getenv('HAVE_HGE')
if hge:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
