Reorganized the test/mppa/ tests to have fewer of them

8 files changed, 18 insertions, 8 deletions

diff --git a/test/mppa/interop/i_manyiargs.c b/test/mppa/interop/i32.c
index d674c26f..6bc2705c 100644
--- a/test/mppa/interop/i_manyiargs.c
+++ b/test/mppa/interop/i32.c
@@ -5,5 +5,9 @@ BEGIN_TEST(int)
   c = i_manyiargs(a, b, a-b, a+b, a*2, b*2, a*2-b, a+b*2, (a-b)*2, (a+b)*2,
                   -2*a, -2*b, a-b, a+b, a*3, b*3, a*3-b, a+b*3, (a-b)*3, (a+b)*3,
                   -3*a, -3*b, a-b, a+b, a*4, b*4, a*4-b, a+b*4, (a-b)*4, (a+b)*4);
-END_TEST()
+  c += i_multiiargs(a, b, a-b, a+b);
+  c += i_oneiarg(a);
+  void_void();
+  c += a;
+END_TEST32()
 
diff --git a/test/mppa/interop/ll_manyllargs.c b/test/mppa/interop/i64.c
index 6e0b3b36..3e7240f7 100644
--- a/test/mppa/interop/ll_manyllargs.c
+++ b/test/mppa/interop/i64.c
@@ -5,4 +5,10 @@ BEGIN_TEST(long long)
   c = ll_manyllargs(a, b, a-b, a+b, a*2, b*2, a*2-b, a+b*2, (a-b)*2, (a+b)*2,
                   -2*a, -2*b, a-b, a+b, a*3, b*3, a*3-b, a+b*3, (a-b)*3, (a+b)*3,
                   -3*a, -3*b, a-b, a+b, a*4, b*4, a*4-b, a+b*4, (a-b)*4, (a+b)*4);
-END_TEST()
+  c += ll_multillargs(a, b, a-b, a+b);
+  c += ll_onellarg(a);
+  c = ll_void();
+  c += a;
+  void_void();
+  c += a;
+END_TEST64()
diff --git a/test/mppa/interop/i_multiiargs.c b/test/mppa/interop/individual/i_multiiargs.c
index 0e8c8936..888742b5 100644
--- a/test/mppa/interop/i_multiiargs.c
+++ b/test/mppa/interop/individual/i_multiiargs.c
@@ -3,4 +3,4 @@
 
 BEGIN_TEST(int)
   c = i_multiiargs(a, b, a-b, a+b);
-END_TEST()
+END_TEST32()
diff --git a/test/mppa/interop/i_oneiarg.c b/test/mppa/interop/individual/i_oneiarg.c
index 42cd1540..9c969fb8 100644
--- a/test/mppa/interop/i_oneiarg.c
+++ b/test/mppa/interop/individual/i_oneiarg.c
@@ -3,4 +3,4 @@
 
 BEGIN_TEST(int)
   c = i_oneiarg(a);
-END_TEST()
+END_TEST32()
diff --git a/test/mppa/interop/ll_multillargs.c b/test/mppa/interop/individual/ll_multillargs.c
index edb03b12..34b422eb 100644
--- a/test/mppa/interop/ll_multillargs.c
+++ b/test/mppa/interop/individual/ll_multillargs.c
@@ -3,5 +3,5 @@
 
 BEGIN_TEST(long long)
   c = ll_multillargs(a, b, a-b, a+b);
-END_TEST()
+END_TEST64()
 
diff --git a/test/mppa/interop/ll_onellarg.c b/test/mppa/interop/individual/ll_onellarg.c
index 0d182166..a2fbbbe9 100644
--- a/test/mppa/interop/ll_onellarg.c
+++ b/test/mppa/interop/individual/ll_onellarg.c
@@ -3,5 +3,5 @@
 
 BEGIN_TEST(long long)
   c = ll_onellarg(a);
-END_TEST()
+END_TEST64()
 
diff --git a/test/mppa/interop/ll_void.c b/test/mppa/interop/individual/ll_void.c
index fa350c9b..da128fdd 100644
--- a/test/mppa/interop/ll_void.c
+++ b/test/mppa/interop/individual/ll_void.c
@@ -4,4 +4,4 @@
 BEGIN_TEST(long long)
   c = ll_void();
   c += a;
-END_TEST()
+END_TEST64()
diff --git a/test/mppa/interop/void_void.c b/test/mppa/interop/individual/void_void.c
index e729edb2..976a721b 100644
--- a/test/mppa/interop/void_void.c
+++ b/test/mppa/interop/individual/void_void.c
@@ -4,4 +4,4 @@
 BEGIN_TEST(long long)
   void_void();
   c = a;
-END_TEST()
+END_TEST64()