Revert "Merging in 1.0.2."

This reverts commit 50cf3276e7.

kern/include/test.h

@@ -30,6 +30,13 @@
 #ifndef _TEST_H_
 #define _TEST_H_
 
+/* Get __PF() for declaring printf-like functions. */
+#include <cdefs.h>
+#include <kern/secret.h>
+
+#include "opt-synchprobs.h"
+#include "opt-automationtest.h"
+
 /*
  * Declarations for test code and other miscellaneous high-level
  * functions.
@@ -52,8 +59,18 @@ int threadtest2(int, char **);
 int threadtest3(int, char **);
 int semtest(int, char **);
 int locktest(int, char **);
+int locktest2(int, char **);
+int locktest3(int, char **);
 int cvtest(int, char **);
 int cvtest2(int, char **);
+int cvtest3(int, char **);
+int cvtest4(int, char **);
+int cvtest5(int, char **);
+int rwtest(int, char **);
+int rwtest2(int, char **);
+int rwtest3(int, char **);
+int rwtest4(int, char **);
+int rwtest5(int, char **);
 
 /* semaphore unit tests */
 int semu1(int, char **);
@@ -88,11 +105,15 @@ int longstress(int, char **);
 int createstress(int, char **);
 int printfile(int, char **);
 
+/* HMAC/hash tests */
+int hmacu1(int, char**);
+
 /* other tests */
 int kmalloctest(int, char **);
 int kmallocstress(int, char **);
 int kmalloctest3(int, char **);
 int kmalloctest4(int, char **);
+int kmalloctest5(int, char **);
 int nettest(int, char **);
 
 /* Routine for running a user-level program. */
@@ -104,5 +125,75 @@ void menu(char *argstr);
 /* The main function, called from start.S. */
 void kmain(char *bootstring);
 
+#if OPT_SYNCHPROBS
+
+/*
+ * Synchronization driver primitives.
+ */
+
+void male_start(uint32_t);
+void male_end(uint32_t);
+void female_start(uint32_t);
+void female_end(uint32_t);
+void matchmaker_start(uint32_t);
+void matchmaker_end(uint32_t);
+int whalemating(int, char **);
+
+void inQuadrant(int, uint32_t);
+void leaveIntersection(uint32_t);
+int stoplight(int, char **);
+
+/*
+ * Synchronization problem primitives.
+ */
+
+/*
+ * whalemating.c.
+ */
+
+void whalemating_init(void);
+void whalemating_cleanup(void);
+void male(uint32_t);
+void female(uint32_t);
+void matchmaker(uint32_t);
+ 
+/*
+ * stoplight.c.
+ */
+
+void gostraight(uint32_t, uint32_t);
+void turnleft(uint32_t, uint32_t);
+void turnright(uint32_t, uint32_t);
+void stoplight_init(void);
+void stoplight_cleanup(void);
+
+#endif
+
+/*
+ * Automation tests for detecting kernel deadlocks and livelocks.
+ */
+
+#if OPT_AUTOMATIONTEST
+int dltest(int, char **);
+int ll1test(int, char **);
+int ll16test(int, char **);
+#endif
+
+void random_yielder(uint32_t);
+void random_spinner(uint32_t);
+
+/*
+ * kprintf variants that do not (or only) print during automated testing.
+ */
+
+#ifdef SECRET_TESTING
+#define kprintf_t(...) kprintf(__VA_ARGS__)
+#define kprintf_n(...) silent(__VA_ARGS__)
+#else
+#define kprintf_t(...) silent(__VA_ARGS__)
+#define kprintf_n(...) kprintf(__VA_ARGS__)
+#endif
+
+static inline void silent(const char * fmt, ...) { (void)fmt; };
 
 #endif /* _TEST_H_ */