Unit tests now build for Android

AnKi/Util/CMakeLists.txt

@@ -7,8 +7,8 @@ else()
 	set(SOURCES ${SOURCES} HighRezTimerWindows.cpp FilesystemWindows.cpp ThreadWindows.cpp ProcessWindows.cpp Win32Minimal.cpp)
 endif()
 
-if(LINUX)
-	set(SOURCES ${SOURCES} INotifyLinux.cpp)
+if(LINUX OR ANDROID)
+	set(SOURCES ${SOURCES} INotifyPosix.cpp)
 elseif(WINDOWS)
 	set(SOURCES ${SOURCES} INotifyWindows.cpp)
 endif()

AnKi/Util/INotify.h

@@ -45,7 +45,7 @@ public:
 private:
 	GenericMemoryPoolAllocator<U8> m_alloc;
 	String m_path;
-#if ANKI_OS_LINUX
+#if ANKI_POSIX
 	int m_fd = -1;
 	int m_watch = -1;
 #endif

Tests/Framework/Framework.cpp

@@ -7,10 +7,19 @@
 #include <iostream>
 #include <cstring>
 #include <malloc.h>
+#if ANKI_OS_ANDROID
+#	include <android/log.h>
+#endif
 
 namespace anki
 {
 
+#if !ANKI_OS_ANDROID
+#	define ANKI_TEST_LOG(fmt, ...) printf(fmt "\n", __VA_ARGS__)
+#else
+#	define ANKI_TEST_LOG(fmt, ...) __android_log_print(ANDROID_LOG_INFO, "AnKi Tests", fmt, __VA_ARGS__)
+#endif
+
 TestSuite::~TestSuite()
 {
 	for(Test* t : tests)
@@ -21,7 +30,7 @@ TestSuite::~TestSuite()
 
 void Test::run()
 {
-	std::cout << "========\nRunning " << suite->name << " " << name << "\n========" << std::endl;
+	ANKI_TEST_LOG("========\nRunning %s %s\n========", suite->name.c_str(), name.c_str());
 
 #if ANKI_OS_LINUX
 	struct mallinfo a = mallinfo();
@@ -35,11 +44,9 @@ void Test::run()
 	int diff = b.uordblks - a.uordblks;
 	if(diff > 0)
 	{
-		std::cerr << "Test leaks memory: " << diff << std::endl;
+		ANKI_TEST_LOG("Test leaks memory: %d", diff);
 	}
 #endif
-
-	std::cout << std::endl;
 }
 
 void Tester::addTest(const char* name, const char* suiteName, TestCallback callback)
@@ -72,7 +79,7 @@ void Tester::addTest(const char* name, const char* suiteName, TestCallback callb
 	{
 		if((*it)->name == name)
 		{
-			std::cerr << "Test already exists: " << name << std::endl;
+			ANKI_TEST_LOG("Test already exists: %s", name);
 			return;
 		}
 	}
@@ -111,7 +118,7 @@ Options:
 		}
 		else if(strcmp(arg, "--help") == 0)
 		{
-			std::cout << helpMessage << std::endl;
+			ANKI_TEST_LOG("%s", helpMessage.c_str());
 			return 0;
 		}
 		else if(strcmp(arg, "--suite") == 0)
@@ -119,7 +126,7 @@ Options:
 			++i;
 			if(i >= argc)
 			{
-				std::cerr << "<name> is missing after --suite" << std::endl;
+				ANKI_TEST_LOG("%s", "<name> is missing after --suite");
 				return 1;
 			}
 			suiteName = argv[i];
@@ -129,7 +136,7 @@ Options:
 			++i;
 			if(i >= argc)
 			{
-				std::cerr << "<name> is missing after --test" << std::endl;
+				ANKI_TEST_LOG("%s", "<name> is missing after --test");
 				return 1;
 			}
 			testName = argv[i];
@@ -139,7 +146,7 @@ Options:
 	// Sanity check
 	if(testName.length() > 0 && suiteName.length() == 0)
 	{
-		std::cout << "Specify --suite as well" << std::endl;
+		ANKI_TEST_LOG("%s", "Specify --suite as well");
 		return 1;
 	}
 
@@ -180,15 +187,15 @@ Options:
 	}
 
 	int failed = run - passed;
-	std::cout << "========\nRun " << run << " tests, failed " << failed << std::endl;
+	ANKI_TEST_LOG("========\nRun %d tests, failed %d", run, failed);
 
 	if(failed == 0)
 	{
-		std::cout << "SUCCESS!" << std::endl;
+		ANKI_TEST_LOG("%s", "SUCCESS!");
 	}
 	else
 	{
-		std::cout << "FAILURE" << std::endl;
+		ANKI_TEST_LOG("%s", "FAILURE");
 	}
 
 	return run - passed;
@@ -200,8 +207,7 @@ int Tester::listTests()
 	{
 		for(Test* test : suite->tests)
 		{
-			std::cout << programName << " --suite \"" << suite->name << "\" --test \"" << test->name << "\""
-					  << std::endl;
+			ANKI_TEST_LOG("%s --suite %s --test %s", programName.c_str(), suite->name.c_str(), test->name.c_str());
 		}
 	}
 

Tests/GenerateAndroidProject.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+cd $SCRIPT_DIR
+../Tools/Android/GenerateAndroidProject.py -o .. -t Tests -a ./Assets/

Tests/Main.cpp

@@ -8,7 +8,8 @@
 
 using namespace anki;
 
-int main(int argc, char** argv)
+ANKI_MAIN_FUNCTION(myMain)
+int myMain(int argc, char** argv)
 {
 	HeapAllocator<U8> alloc(allocAligned, nullptr);
 

Tools/Android/app/build.gradle

@@ -19,6 +19,7 @@ android {
                             "-DANDROID_STL=c++_static",
                             "-DCMAKE_BUILD_TYPE=Debug",
                             "-DANKI_EXTRA_CHECKS=ON",
+                            "-DANKI_BUILD_TESTS=ON",
                             "-DPYTHON_EXECUTABLE:FILEPATH=%PYTHON%"
                     version "3.12+"
                     targets "%TARGET%"
@@ -37,6 +38,7 @@ android {
                             "-DANDROID_STL=c++_static",
                             "-DCMAKE_BUILD_TYPE=Release",
                             "-DANKI_EXTRA_CHECKS=OFF",
+                            "-DANKI_BUILD_TESTS=ON",
                             "-DPYTHON_EXECUTABLE:FILEPATH=%PYTHON%"
                     version "3.12+"
                     targets "%TARGET%"