From 92ff302a142885a7816958f4085e271bc5e9e09f Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Sun, 20 Oct 2013 23:28:16 +0300
Subject: [PATCH] Fixed cross compilation back up.

---
 interpreter.py                           |  9 +--------
 meson_test.py                            |  4 ++--
 test cases/common/25 numbers/meson.build |  7 -------
 test cases/common/25 numbers/prog.c      | 10 ----------
 4 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 test cases/common/25 numbers/meson.build
 delete mode 100644 test cases/common/25 numbers/prog.c

diff --git a/interpreter.py b/interpreter.py
index 76d9f4a37..4ab5c5f86 100644
--- a/interpreter.py
+++ b/interpreter.py
@@ -243,16 +243,9 @@ class Host(InterpreterObject):
     def __init__(self, envir):
         InterpreterObject.__init__(self)
         self.environment = envir
-        self.methods.update({'pointer_size' : self.get_ptrsize_method,
-                             'name' : self.get_name_method,
+        self.methods.update({'name' : self.get_name_method,
                              'is_big_endian' : self.is_big_endian_method,
                              })
-    # Is this needed any more since we have proper compiler
-    # based tests? Consider removing it.
-    def get_ptrsize_method(self, args, kwargs):
-        if sys.maxsize > 2**32:
-            return 64
-        return 32
 
     def get_name_method(self, args, kwargs):
         if self.environment.is_cross_build():
diff --git a/meson_test.py b/meson_test.py
index 3bba960d6..e8b8a12bb 100755
--- a/meson_test.py
+++ b/meson_test.py
@@ -47,7 +47,7 @@ def run_single_test(wrap, test):
             # because there is no execute wrapper.
             cmd = None
         else:
-            cmd = [exe_runner, test.fname]
+            cmd = [test.exe_runner, test.fname]
     else:
         cmd = [test.fname]
     if cmd is None:
@@ -114,7 +114,7 @@ def run_tests(options, datafilename):
         if not test.is_parallel:
             drain_futures(futures)
             futures = []
-            res = run_single_test(wrap, t)
+            res = run_single_test(wrap, test)
             print_stats(numlen, tests, test.name, res, i, logfile)
         else:
             f = executor.submit(run_single_test, wrap, test)
diff --git a/test cases/common/25 numbers/meson.build b/test cases/common/25 numbers/meson.build
deleted file mode 100644
index 243f2ab0d..000000000
--- a/test cases/common/25 numbers/meson.build	
+++ /dev/null
@@ -1,7 +0,0 @@
-project('numbers', 'c')
-
-if host.pointer_size() == 64
-  add_global_arguments('-DIS64', language : 'c')
-endif
-
-test('sizetest', executable('prog', 'prog.c'))
diff --git a/test cases/common/25 numbers/prog.c b/test cases/common/25 numbers/prog.c
deleted file mode 100644
index d4c7872e1..000000000
--- a/test cases/common/25 numbers/prog.c	
+++ /dev/null
@@ -1,10 +0,0 @@
-int main(int argc, char **argv) {
-    int ptrsize = sizeof(void*);
-    int expsize;
-#ifdef IS64
-    expsize = 8;
-#else
-    expsize = 4;
-#endif
-    return ptrsize == expsize ? 0 : 1;
-}