Update tests.

5 files changed, 76 insertions, 71 deletions

diff --git a/lib/thread/bld.proj b/lib/thread/bld.proj
index 3e9e3b1..84295f3 100644
--- a/lib/thread/bld.proj
+++ b/lib/thread/bld.proj
@@ -10,6 +10,3 @@ lib thread =
 	atomic.myr
 ;;
 
-test smoketest =
-	smoketest.myr
-;;
diff --git a/lib/thread/smoketest.myr b/lib/thread/smoketest.myr
deleted file mode 100644
index c98ebe7..0000000
--- a/lib/thread/smoketest.myr
+++ /dev/null
@@ -1,68 +0,0 @@
-use std
-use sys
-use thread
-
-var val : uint64 = 0
-var done : uint32 = 0
-var mtx : thread.mutex
-
-const Nherd = 20
-
-const main = {
-	atomictest()
-	mtxtest()
-}
-
-
-const atomictest = {
-	done = 0
-	val = 0
-	mkherd(Nherd, atomicincvar)
-	while thread.xget(&done) != Nherd
-		/* nothing */
-	;;
-	std.assert(val == 20_000_000, "atomics are broken\n")
-}
-
-const atomicincvar = {
-	var i
-
-	for i = 0; i < 1_000_000; i++
-		thread.xadd(&val, 1)
-	;;
-	std.write(1, "done\n")
-	thread.xadd(&done, 1)
-}
-
-
-const mtxincvar = {
-	var i
-
-	for i = 0; i < 100_000; i++
-		thread.mtxlock(&mtx)
-		val++
-		thread.mtxunlock(&mtx)
-	;;
-	std.write(1, "done\n")
-	thread.xadd(&done, 1)
-}
-
-const mtxtest = {
-	done = 0
-	val = 0
-
-	mtx = thread.mkmtx()
-	mkherd(Nherd, mtxincvar)
-	while thread.xget(&done) != Nherd
-		/* nothing */
-	;;
-	if val != 100_000 * 20
-		std.fatal("mutexes are broken, got {}\n", val)
-	;;
-}
-
-const mkherd = {n, fn
-	for var i = 0; i < n; i++
-		std.try(thread.spawn(fn))
-	;;
-}
diff --git a/lib/thread/test/atomic.myr b/lib/thread/test/atomic.myr
new file mode 100644
index 0000000..a6f72c6
--- /dev/null
+++ b/lib/thread/test/atomic.myr
@@ -0,0 +1,30 @@
+use std
+use thread
+
+use "test/util.use"
+
+const Nherd = 20
+
+var val : uint64 = 0
+var done : uint32 = 0
+
+const main = {
+	done = 0
+	val = 0
+	mkherd(Nherd, incvar)
+	while thread.xget(&done) != Nherd
+		/* nothing */
+	;;
+	std.assert(val == 20_000_000, "atomics are broken\n")
+}
+
+const incvar = {
+	var i
+
+	for i = 0; i < 1_000_000; i++
+		thread.xadd(&val, 1)
+	;;
+	std.write(1, "done\n")
+	thread.xadd(&done, 1)
+}
+
diff --git a/lib/thread/test/mutex.myr b/lib/thread/test/mutex.myr
new file mode 100644
index 0000000..e971490
--- /dev/null
+++ b/lib/thread/test/mutex.myr
@@ -0,0 +1,34 @@
+use std
+use thread
+
+use "test/util.use"
+
+const Nherd = 20
+
+var val : uint64 = 0
+var done : uint32 = 0
+var mtx : thread.mutex
+
+const main = {
+	done = 0
+	val = 0
+
+	mtx = thread.mkmtx()
+	mkherd(Nherd, incvar)
+	while thread.xget(&done) != Nherd
+		/* nothing */
+	;;
+	if val != 100_000 * 20
+		std.fatal("mutexes are broken, got {}\n", val)
+	;;
+}
+
+const incvar = {
+	for var i = 0; i < 100_000; i++
+		thread.mtxlock(&mtx)
+		val++
+		thread.mtxunlock(&mtx)
+	;;
+	std.write(1, "done\n")
+	thread.xadd(&done, 1)
+}
diff --git a/lib/thread/test/util.myr b/lib/thread/test/util.myr
new file mode 100644
index 0000000..610a095
--- /dev/null
+++ b/lib/thread/test/util.myr
@@ -0,0 +1,12 @@
+use std
+use thread
+
+pkg =
+	const mkherd : (n : uint32, fn : (-> void) ->void)
+;;
+
+const mkherd = {n, fn
+	for var i = 0; i < n; i++
+		std.try(thread.spawn(fn))
+	;;
+}