Module Name: src
Committed By: jmmv
Date: Sun Jul 18 12:41:51 UTC 2010
Modified Files:
src/tests/lib: Makefile
Added Files:
src/tests/lib/libobjc: Makefile t_threads.m
Log Message:
Convert the libobjc tests to atf. While doing this, make the tests actually
check that things work.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libobjc/Makefile \
src/tests/lib/libobjc/t_threads.m
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/Makefile
diff -u src/tests/lib/Makefile:1.7 src/tests/lib/Makefile:1.8
--- src/tests/lib/Makefile:1.7 Sat Jul 17 19:25:26 2010
+++ src/tests/lib/Makefile Sun Jul 18 12:41:51 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2010/07/17 19:25:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2010/07/18 12:41:51 jmmv Exp $
.include <bsd.own.mk>
-TESTS_SUBDIRS= csu libc libevent libposix libprop librt libpthread libutil \
- semaphore
+TESTS_SUBDIRS= csu libc libevent libobjc libposix libprop librt libpthread \
+ libutil semaphore
.if (${MKSKEY} != "no")
TESTS_SUBDIRS+= libskey
Added files:
Index: src/tests/lib/libobjc/Makefile
diff -u /dev/null src/tests/lib/libobjc/Makefile:1.1
--- /dev/null Sun Jul 18 12:41:52 2010
+++ src/tests/lib/libobjc/Makefile Sun Jul 18 12:41:51 2010
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2010/07/18 12:41:51 jmmv Exp $
+
+TESTSDIR= ${TESTSBASE}/lib/libobjc
+
+TESTS_C= t_threads
+SRCS.t_threads= t_threads.m
+WARNS?= 4
+CFLAGS+= -pthread
+LDFLAGS+= -pthread
+DPADD+= ${LIBOBJC}
+LDADD+= -lobjc
+
+.include <bsd.test.mk>
Index: src/tests/lib/libobjc/t_threads.m
diff -u /dev/null src/tests/lib/libobjc/t_threads.m:1.1
--- /dev/null Sun Jul 18 12:41:52 2010
+++ src/tests/lib/libobjc/t_threads.m Sun Jul 18 12:41:51 2010
@@ -0,0 +1,106 @@
+/* $NetBSD: t_threads.m,v 1.1 2010/07/18 12:41:51 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Originally written by David Wetzel */
+
+#include <assert.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+static int IsMultithreaded = 0;
+static objc_mutex_t Mutex;
+static objc_condition_t Condition;
+
+...@interface MyClass : Object
+{
+}
+-(void)start;
+...@end
+
+...@implementation MyClass
+-(void)start
+{
+ printf("detached thread started!\n");
+
+ objc_condition_signal(Condition);
+}
+...@end
+
+static void
+becomeMultiThreaded(void)
+{
+ printf("becoming multithreaded!\n");
+ IsMultithreaded++;
+}
+
+ATF_TC(thread_callback);
+ATF_TC_HEAD(thread_callback, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Checks that the thread callback is only"
+ "called once");
+}
+ATF_TC_BODY(thread_callback, tc)
+{
+ id o = [MyClass new];
+ objc_thread_callback cb;
+ objc_thread_t rv;
+
+ cb = objc_set_thread_callback(becomeMultiThreaded);
+ printf("Old Callback: %p\n", cb);
+ ATF_CHECK(cb == 0);
+
+ Mutex = objc_mutex_allocate();
+ Condition = objc_condition_allocate();
+
+ ATF_CHECK_EQ(0, IsMultithreaded);
+
+ rv = objc_thread_detach(@selector(start), o, nil);
+ printf("detach value: %p\n", rv);
+ assert(rv != NULL);
+
+ objc_mutex_lock(Mutex);
+ objc_condition_wait(Condition, Mutex);
+ objc_mutex_unlock(Mutex);
+
+ ATF_CHECK_EQ(1, IsMultithreaded);
+ printf("Shutting down\n");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, thread_callback);
+
+ return atf_no_error();
+}
