From c25ad82a89f878d81ae8ad89d75aa796ad804408 Mon Sep 17 00:00:00 2001 From: David Given Date: Wed, 16 Nov 2016 21:08:03 +0100 Subject: [PATCH] Tests can now specify (via a hacky filename suffix) which runtime they want. --- plat/qemuppc/tests/build.lua | 7 ++++++- plat/qemuppc/tests/{intadd.c => intadd_e.c} | 0 plat/qemuppc/tests/{intcmp.c => intcmp_e.c} | 0 plat/qemuppc/tests/{div.c => intdiv_e.c} | 0 plat/qemuppc/tests/{intshift.c => intshift_e.c} | 0 plat/qemuppc/tests/{intsub.c => intsub_e.c} | 0 plat/qemuppc/tests/lib/test.c | 2 +- 7 files changed, 7 insertions(+), 2 deletions(-) rename plat/qemuppc/tests/{intadd.c => intadd_e.c} (100%) rename plat/qemuppc/tests/{intcmp.c => intcmp_e.c} (100%) rename plat/qemuppc/tests/{div.c => intdiv_e.c} (100%) rename plat/qemuppc/tests/{intshift.c => intshift_e.c} (100%) rename plat/qemuppc/tests/{intsub.c => intsub_e.c} (100%) diff --git a/plat/qemuppc/tests/build.lua b/plat/qemuppc/tests/build.lua index ec4cbf610..024961fda 100644 --- a/plat/qemuppc/tests/build.lua +++ b/plat/qemuppc/tests/build.lua @@ -10,6 +10,10 @@ else for _, f in ipairs(testcases) do local fs = replace(basename(f), "%..$", "") + local _, _, lang = fs:find("_(.)$") + if not lang then + lang = "e" + end local bin = ackprogram { name = fs.."_bin", @@ -17,7 +21,8 @@ else deps = { "plat/qemuppc/tests/lib+lib" }, vars = { plat = "qemuppc", - lang = "e", + lang = lang, + ackcflags = "-O0" } } diff --git a/plat/qemuppc/tests/intadd.c b/plat/qemuppc/tests/intadd_e.c similarity index 100% rename from plat/qemuppc/tests/intadd.c rename to plat/qemuppc/tests/intadd_e.c diff --git a/plat/qemuppc/tests/intcmp.c b/plat/qemuppc/tests/intcmp_e.c similarity index 100% rename from plat/qemuppc/tests/intcmp.c rename to plat/qemuppc/tests/intcmp_e.c diff --git a/plat/qemuppc/tests/div.c b/plat/qemuppc/tests/intdiv_e.c similarity index 100% rename from plat/qemuppc/tests/div.c rename to plat/qemuppc/tests/intdiv_e.c diff --git a/plat/qemuppc/tests/intshift.c b/plat/qemuppc/tests/intshift_e.c similarity index 100% rename from plat/qemuppc/tests/intshift.c rename to plat/qemuppc/tests/intshift_e.c diff --git a/plat/qemuppc/tests/intsub.c b/plat/qemuppc/tests/intsub_e.c similarity index 100% rename from plat/qemuppc/tests/intsub.c rename to plat/qemuppc/tests/intsub_e.c diff --git a/plat/qemuppc/tests/lib/test.c b/plat/qemuppc/tests/lib/test.c index 02d98773b..33d72f3ce 100644 --- a/plat/qemuppc/tests/lib/test.c +++ b/plat/qemuppc/tests/lib/test.c @@ -25,7 +25,7 @@ void writehex(uint32_t code) void fail(uint32_t code) { - write(1, "@@FAIL ", 7); + write(1, "@@FAIL on line 0x", 7); writehex(code); write(1, "\n", 1); } -- 2.34.1