From: Thomas Huth <th...@redhat.com> These checks at the beginning of some of the tests are mostly useless: We only run the tests on x86 anyway, and g_test_message() does not print anything unless you call g_test_init() first.
Signed-off-by: Thomas Huth <th...@redhat.com> Acked-by: John Snow <js...@redhat.com> Acked-by: Corey Minyard <cminy...@mvista.com> Message-Id: <1551456970-463-1-git-send-email-th...@redhat.com> Signed-off-by: Laurent Vivier <laur...@vivier.eu> --- tests/fdc-test.c | 7 ------- tests/ide-test.c | 7 ------- tests/ipmi-bt-test.c | 7 ------- tests/ipmi-kcs-test.c | 7 ------- 4 files changed, 28 deletions(-) diff --git a/tests/fdc-test.c b/tests/fdc-test.c index 88f1abfa10e2..31cd3295c102 100644 --- a/tests/fdc-test.c +++ b/tests/fdc-test.c @@ -548,16 +548,9 @@ static void fuzz_registers(void) int main(int argc, char **argv) { - const char *arch = qtest_get_arch(); int fd; int ret; - /* Check architecture */ - if (strcmp(arch, "i386") && strcmp(arch, "x86_64")) { - g_test_message("Skipping test for non-x86\n"); - return 0; - } - /* Create a temporary raw image */ fd = mkstemp(test_image); g_assert(fd >= 0); diff --git a/tests/ide-test.c b/tests/ide-test.c index f0280e636b5d..300d64e77ddf 100644 --- a/tests/ide-test.c +++ b/tests/ide-test.c @@ -1009,16 +1009,9 @@ static void test_cdrom_dma(void) int main(int argc, char **argv) { - const char *arch = qtest_get_arch(); int fd; int ret; - /* Check architecture */ - if (strcmp(arch, "i386") && strcmp(arch, "x86_64")) { - g_test_message("Skipping test for non-x86\n"); - return 0; - } - /* Create temporary blkdebug instructions */ fd = mkstemp(debug_path); g_assert(fd >= 0); diff --git a/tests/ipmi-bt-test.c b/tests/ipmi-bt-test.c index f4a81b526505..fc4c83b5db7c 100644 --- a/tests/ipmi-bt-test.c +++ b/tests/ipmi-bt-test.c @@ -400,15 +400,8 @@ static void open_socket(void) int main(int argc, char **argv) { - const char *arch = qtest_get_arch(); int ret; - /* Check architecture */ - if (strcmp(arch, "i386") && strcmp(arch, "x86_64")) { - g_test_message("Skipping test for non-x86\n"); - return 0; - } - open_socket(); /* Run the tests */ diff --git a/tests/ipmi-kcs-test.c b/tests/ipmi-kcs-test.c index 178ffc179734..a2354c10c7fe 100644 --- a/tests/ipmi-kcs-test.c +++ b/tests/ipmi-kcs-test.c @@ -263,16 +263,9 @@ static void test_enable_irq(void) int main(int argc, char **argv) { - const char *arch = qtest_get_arch(); char *cmdline; int ret; - /* Check architecture */ - if (strcmp(arch, "i386") && strcmp(arch, "x86_64")) { - g_test_message("Skipping test for non-x86\n"); - return 0; - } - /* Run the tests */ g_test_init(&argc, &argv, NULL); -- 2.20.1