Removed outdated unit tests in src/Thread.c as there are up-to-date unit tests in test/thread.c

src/Thread.c

@@ -29,9 +29,6 @@
 
 
 #include "Thread.h"
-#if defined(THREAD_UNIT_TESTS)
-#define NOSTACKTRACE
-#endif
 #include "Log.h"
 #include "StackTrace.h"
 
@@ -371,141 +368,3 @@ int Thread_destroy_evt(evt_type evt)
 	return rc;
 }
 
-
-#if defined(THREAD_UNIT_TESTS)
-
-#if defined(_WIN32) || defined(_WINDOWS)
-#define mqsleep(A) Sleep(1000*A)
-#define START_TIME_TYPE DWORD
-static DWORD start_time = 0;
-START_TIME_TYPE start_clock(void)
-{
-	return GetTickCount();
-}
-#elif defined(AIX)
-#define mqsleep sleep
-#define START_TIME_TYPE struct timespec
-START_TIME_TYPE start_clock(void)
-{
-	static struct timespec start;
-	clock_gettime(CLOCK_REALTIME, &start);
-	return start;
-}
-#else
-#define mqsleep sleep
-#define START_TIME_TYPE struct timeval
-/* TODO - unused - remove? static struct timeval start_time; */
-START_TIME_TYPE start_clock(void)
-{
-	struct timeval start_time;
-	gettimeofday(&start_time, NULL);
-	return start_time;
-}
-#endif
-
-
-#if defined(_WIN32)
-long elapsed(START_TIME_TYPE start_time)
-{
-	return GetTickCount() - start_time;
-}
-#elif defined(AIX)
-#define assert(a)
-long elapsed(struct timespec start)
-{
-	struct timespec now, res;
-
-	clock_gettime(CLOCK_REALTIME, &now);
-	ntimersub(now, start, res);
-	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
-}
-#else
-long elapsed(START_TIME_TYPE start_time)
-{
-	struct timeval now, res;
-
-	gettimeofday(&now, NULL);
-	timersub(&now, &start_time, &res);
-	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
-}
-#endif
-
-
-int tests = 0, failures = 0;
-
-void myassert(char* filename, int lineno, char* description, int value, char* format, ...)
-{
-	++tests;
-	if (!value)
-	{
-		va_list args;
-
-		++failures;
-		printf("Assertion failed, file %s, line %d, description: %s\n", filename, lineno, description);
-
-		va_start(args, format);
-		vprintf(format, args);
-		va_end(args);
-
-		//cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n",
-        //                description, filename, lineno);
-	}
-    else
-    		printf("Assertion succeeded, file %s, line %d, description: %s\n", filename, lineno, description);
-}
-
-#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
-#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
-
-#include <stdio.h>
-
-thread_return_type cond_secondary(void* n)
-{
-	int rc = 0;
-	evt_type evt = n;
-
-	printf("This should return immediately as it was posted already\n");
-	rc = Thread_wait_evt(evt, 99999);
-	assert("rc 1 from wait_evt", rc == 1, "rc was %d", rc);
-
-	printf("This should hang around a few seconds\n");
-	rc = Thread_wait_evt(evt, 99999);
-	assert("rc 1 from wait_evt", rc == 1, "rc was %d", rc);
-
-	printf("Secondary evt thread ending\n");
-	return 0;
-}
-
-
-int evt_test()
-{
-	int rc = 0;
-	evt_type evt = Thread_create_evt();
-
-	printf("Post secondary so it should return immediately\n");
-	rc = Thread_signal_evt(evt);
-	assert("rc 0 from signal evt", rc == 0, "rc was %d", rc);
-
-	printf("Starting secondary thread\n");
-	Thread_start(cond_secondary, (void*)cond);
-
-	sleep(3);
-
-	printf("post secondary\n");
-	rc = Thread_signal_evt(evt);
-	assert("rc 1 from signal evt", rc == 1, "rc was %d", rc);
-
-	sleep(3);
-
-	printf("Main thread ending\n");
-
-	return failures;
-}
-
-int main(int argc, char *argv[])
-{
-	sem_test();
-	//cond_test();
-}
-
-#endif