From 6a54f19b760e9c2aae57c0bb3a328281139b43c9 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias <rodrigo.arias@bsc.es>
Date: Tue, 10 Sep 2024 11:21:44 +0200
Subject: [PATCH] Fix unit tests

---
 test/unit/CMakeLists.txt |  3 +--
 test/unit/cpu.c          |  8 ++++----
 test/unit/loom.c         | 12 +++++-------
 test/unit/thread.c       | 35 -----------------------------------
 4 files changed, 10 insertions(+), 48 deletions(-)
 delete mode 100644 test/unit/thread.c

diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index 8bbe3f2..639ad80 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -15,9 +15,8 @@ unit_test(cpu.c)
 unit_test(loom.c)
 unit_test(mux.c)
 unit_test(prv.c)
-unit_test(stream.c)
+#unit_test(stream.c) #FIXME
 unit_test(task.c)
-unit_test(thread.c)
 unit_test(value.c)
 unit_test(version.c)
 unit_test(path.c)
diff --git a/test/unit/cpu.c b/test/unit/cpu.c
index b39b12b..1c94b2e 100644
--- a/test/unit/cpu.c
+++ b/test/unit/cpu.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2021-2023 Barcelona Supercomputing Center (BSC)
+/* Copyright (c) 2021-2024 Barcelona Supercomputing Center (BSC)
  * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "emu/cpu.h"
@@ -27,7 +27,7 @@ test_oversubscription(void)
 
 	struct proc proc;
 
-	if (proc_init_begin(&proc, "loom.0/proc.0") != 0)
+	if (proc_init_begin(&proc, 1) != 0)
 		die("proc_init_begin failed");
 
 	proc_set_gindex(&proc, 0);
@@ -38,7 +38,7 @@ test_oversubscription(void)
 
 	struct thread th0, th1;
 
-	if (thread_init_begin(&th0, "loom.0/proc.0/thread.0.obs") != 0)
+	if (thread_init_begin(&th0, 1) != 0)
 		die("thread_init_begin failed");
 
 	thread_set_gindex(&th0, 0);
@@ -47,7 +47,7 @@ test_oversubscription(void)
 	if (thread_init_end(&th0) != 0)
 		die("thread_init_end failed");
 
-	if (thread_init_begin(&th1, "loom.1/proc.1/thread.1.obs") != 0)
+	if (thread_init_begin(&th1, 2) != 0)
 		die("thread_init_begin failed");
 
 	thread_set_gindex(&th1, 1);
diff --git a/test/unit/loom.c b/test/unit/loom.c
index 6283f90..c1df60e 100644
--- a/test/unit/loom.c
+++ b/test/unit/loom.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2021-2023 Barcelona Supercomputing Center (BSC)
+/* Copyright (c) 2021-2024 Barcelona Supercomputing Center (BSC)
  * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "emu/loom.h"
@@ -8,19 +8,17 @@
 #include "emu/proc.h"
 #include "unittest.h"
 
-char testloom[] = "loom.0";
-char testproc[] = "loom.0/proc.1";
+char testloom[] = "node1";
+int testproc = 1;
 
 static void
 test_bad_name(struct loom *loom)
 {
-	ERR(loom_init_begin(loom, "blah"));
 	ERR(loom_init_begin(loom, "loom/blah"));
-	ERR(loom_init_begin(loom, "loom.123/testloom"));
-	ERR(loom_init_begin(loom, "loom.123/"));
 	ERR(loom_init_begin(loom, "/loom.123"));
 	ERR(loom_init_begin(loom, "./loom.123"));
 	OK(loom_init_begin(loom, "loom.123"));
+	OK(loom_init_begin(loom, "foo"));
 
 	err("ok");
 }
@@ -28,7 +26,7 @@ test_bad_name(struct loom *loom)
 static void
 test_hostname(struct loom *loom)
 {
-	OK(loom_init_begin(loom, "loom.node1.blah"));
+	OK(loom_init_begin(loom, "node1.blah"));
 
 	if (strcmp(loom->hostname, "node1") != 0)
 		die("wrong hostname: %s", loom->hostname);
diff --git a/test/unit/thread.c b/test/unit/thread.c
deleted file mode 100644
index 05fe8ef..0000000
--- a/test/unit/thread.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (c) 2021-2023 Barcelona Supercomputing Center (BSC)
- * SPDX-License-Identifier: GPL-3.0-or-later */
-
-#include "common.h"
-#include "emu/thread.h"
-#include "unittest.h"
-
-/* Ensure we can load the old trace format */
-static void
-test_old_trace(void)
-{
-	struct thread th;
-
-	OK(thread_init_begin(&th, "loom.0/proc.0/thread.1.obs"));
-	if (th.tid != 1)
-		die("wrong tid");
-
-	OK(thread_init_begin(&th, "loom.0/proc.0/thread.2"));
-	if (th.tid != 2)
-		die("wrong tid");
-
-	ERR(thread_init_begin(&th, "loom.0/proc.0/thread.kk"));
-	ERR(thread_init_begin(&th, "loom.0/proc.0/thread."));
-	ERR(thread_init_begin(&th, "loom.0/proc.0/thread"));
-	ERR(thread_init_begin(&th, "thread.prv"));
-
-	err("ok");
-}
-
-int main(void)
-{
-	test_old_trace();
-
-	return 0;
-}