@@ -1,13 +1,20 @@
 include ../extra.mk
 
-SUBDIRS = ${TESTPLUGIN}
+SUBDIRS = ${TESTPLUGIN}	\
+	  ${OBJC_SYNC}	\
+	  terminal
 
 CLEAN = EBOOT.PBP		\
 	boot.dol		\
 	${PROG_NOINST}.arm9	\
-	${PROG_NOINST}.nds
+	${PROG_NOINST}.nds	\
+	${PROG_NOINST}.nro	\
+	${PROG_NOINST}.rpx	\
+	serialization_xml.m	\
+	testfile_bin.m		\
+	testfile_ini.m
 DISTCLEAN = Info.plist
 
 PROG_NOINST = tests${PROG_SUFFIX}
 STATIC_LIB_NOINST = ${TESTS_STATIC_LIB}
 SRCS = ForwardingTests.m		\
@@ -17,89 +24,104 @@
        ${OF_BLOCK_TESTS_M}		\
        OFCharacterSetTests.m		\
        OFDataTests.m			\
        OFDateTests.m			\
        OFDictionaryTests.m		\
+       OFHMACTests.m			\
+       OFINIFileTests.m			\
        OFInvocationTests.m		\
        OFJSONTests.m			\
        OFListTests.m			\
        OFLocaleTests.m			\
+       OFMD5HashTests.m			\
+       OFMemoryStreamTests.m		\
        OFMethodSignatureTests.m		\
+       OFNotificationCenterTests.m	\
        OFNumberTests.m			\
        OFObjectTests.m			\
+       OFPBKDF2Tests.m			\
        OFPropertyListTests.m		\
+       OFRIPEMD160HashTests.m		\
+       OFSHA1HashTests.m		\
+       OFSHA224HashTests.m		\
+       OFSHA256HashTests.m		\
+       OFSHA384HashTests.m		\
+       OFSHA512HashTests.m		\
+       OFScryptTests.m			\
+       OFSerializationTests.m		\
        OFSetTests.m			\
        OFStreamTests.m			\
        OFStringTests.m			\
        OFSystemInfoTests.m		\
        OFURLTests.m			\
        OFValueTests.m			\
        OFXMLElementBuilderTests.m	\
        OFXMLNodeTests.m			\
        OFXMLParserTests.m		\
-       PBKDF2Tests.m			\
        RuntimeTests.m			\
        ${RUNTIME_ARC_TESTS_M}		\
-       ScryptTests.m			\
        TestsAppDelegate.m		\
        ${USE_SRCS_FILES}		\
        ${USE_SRCS_PLUGINS}		\
        ${USE_SRCS_SOCKETS}		\
        ${USE_SRCS_THREADS}		\
-       ${USE_SRCS_WINDOWS}
-SRCS_FILES = OFHMACTests.m		\
-	     OFINIFileTests.m		\
-	     OFMD5HashTests.m		\
-	     OFRIPEMD160HashTests.m	\
-	     OFSerializationTests.m	\
-	     OFSHA1HashTests.m		\
-	     OFSHA224HashTests.m	\
-	     OFSHA256HashTests.m	\
-	     OFSHA384HashTests.m	\
-	     OFSHA512HashTests.m
-SRCS_IPX = OFIPXSocketTests.m		\
-	   OFSPXSocketTests.m		\
-	   OFSPXStreamSocketTests.m
+       ${USE_SRCS_WINDOWS}		\
+       serialization_xml.m		\
+       testfile_bin.m			\
+       testfile_ini.m
 SRCS_PLUGINS = OFPluginTests.m
 SRCS_SOCKETS = OFDNSResolverTests.m		\
 	       ${OF_HTTP_CLIENT_TESTS_M}	\
 	       OFHTTPCookieTests.m		\
 	       OFHTTPCookieManagerTests.m	\
 	       OFKernelEventObserverTests.m	\
+	       OFSocketTests.m			\
 	       OFTCPSocketTests.m		\
 	       OFUDPSocketTests.m		\
-	       SocketTests.m			\
-	       ${USE_SRCS_IPX}
+	       ${USE_SRCS_IPX}			\
+	       ${USE_SRCS_UNIX_SOCKETS}
+SRCS_IPX = OFIPXSocketTests.m		\
+	   OFSPXSocketTests.m		\
+	   OFSPXStreamSocketTests.m
+SRCS_UNIX_SOCKETS = OFUNIXDatagramSocketTests.m	\
+		    OFUNIXStreamSocketTests.m
 SRCS_THREADS = OFThreadTests.m
 SRCS_WINDOWS = OFWindowsRegistryKeyTests.m
 
 IOS_USER ?= mobile
 IOS_TMP ?= /tmp/objfw-test
 
 include ../buildsys.mk
 
-post-all: ${RUN_TESTS}
+serialization_xml.m: serialization.xml
+	${SHELL} ../utils/objfw-embed serialization.xml /serialization.xml $@
+testfile_bin.m: testfile.bin
+	${SHELL} ../utils/objfw-embed testfile.bin /testfile.bin $@
+testfile_ini.m: testfile.ini
+	${SHELL} ../utils/objfw-embed testfile.ini /testfile.ini $@
 
 .PHONY: run run-on-ios run-on-android
 run:
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR}
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}
-	rm -f objfw.dll libobjfw.${OBJFW_LIB_MAJOR}.dylib
+	rm -f objfw${OBJFW_LIB_MAJOR}.dll libobjfw.${OBJFW_LIB_MAJOR}.dylib
 	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR}
 	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}
-	rm -f objfwrt.dll libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib
+	rm -f objfwrt${OBJFWRT_LIB_MAJOR}.dll
+	rm -f libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib
 	rm -f ${OBJFWRT_AMIGA_LIB}
 	if test -f ../src/libobjfw.so; then \
 		${LN_S} ../src/libobjfw.so libobjfw.so.${OBJFW_LIB_MAJOR}; \
 		${LN_S} ../src/libobjfw.so \
 		    libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
 	elif test -f ../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; then \
 		${LN_S} ../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} \
 		    libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
 	fi
-	if test -f ../src/objfw.dll; then \
-		${LN_S} ../src/objfw.dll objfw.dll; \
+	if test -f ../src/objfw${OBJFW_LIB_MAJOR}.dll; then \
+		${LN_S} ../src/objfw${OBJFW_LIB_MAJOR}.dll \
+			objfw${OBJFW_LIB_MAJOR}.dll; \
 	fi
 	if test -f ../src/libobjfw.dylib; then \
 		${LN_S} ../src/libobjfw.dylib \
 		    libobjfw.${OBJFW_LIB_MAJOR}.dylib; \
 	fi
@@ -109,12 +131,13 @@
 		${LN_S} ../src/runtime/libobjfwrt.so \
 		    libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; \
 	elif test -f ../src/runtime/libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; then \
 		${LN_S} ../src/runtime/libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR} libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; \
 	fi
-	if test -f ../src/runtime/objfwrt.dll; then \
-		${LN_S} ../src/runtime/objfwrt.dll objfwrt.dll; \
+	if test -f ../src/runtime/objfwrt${OBJFWRT_LIB_MAJOR}.dll; then \
+		${LN_S} ../src/runtime/objfwrt${OBJFWRT_LIB_MAJOR}.dll \
+			objfwrt${OBJFWRT_LIB_MAJOR}.dll; \
 	fi
 	if test -f ../src/runtime/libobjfwrt.dylib; then \
 		${LN_S} ../src/runtime/libobjfwrt.dylib \
 		    libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib; \
 	fi
@@ -127,14 +150,16 @@
 	DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \
 	LIBRARY_PATH=.$${LIBRARY_PATH+:}$$LIBRARY_PATH \
 	ASAN_OPTIONS=allocator_may_return_null=1 \
 	${WRAPPER} ./${PROG_NOINST}; EXIT=$$?; \
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR}; \
-	rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} objfw.dll; \
+	rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
+	rm -f objfw${OBJFW_LIB_MAJOR}.dll; \
 	rm -f libobjfw.${OBJFW_LIB_MAJOR}.dylib; \
 	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR}; \
-	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR} objfwrt.dll; \
+	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; \
+	rm -f objfwrt${OBJFWRT_LIB_MAJOR}.dll; \
 	rm -f libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib; \
 	exit $$EXIT
 
 run-on-ios: all
 	if [ -z "${IOS_HOST}" ]; then \
@@ -145,12 +170,11 @@
 	ssh ${IOS_USER}@${IOS_HOST} \
 	    'rm -fr ${IOS_TMP} && mkdir -p ${IOS_TMP}/plugin'
 	destname=libobjfw.${OBJFW_LIB_MAJOR}.dylib; \
 	scp -q ../src/libobjfw.dylib \
 	    ${IOS_USER}@${IOS_HOST}:${IOS_TMP}/$$destname
-	scp -q tests testfile.bin testfile.txt testfile.ini serialization.xml \
-	    ${IOS_USER}@${IOS_HOST}:${IOS_TMP}/
+	scp -q tests testfile.txt ${IOS_USER}@${IOS_HOST}:${IOS_TMP}/
 	scp -q plugin/TestPlugin.bundle \
 	    ${IOS_USER}@${IOS_HOST}:${IOS_TMP}/plugin/
 	echo "Running tests binary on iOS device ${IOS_HOST}..."
 	ssh ${IOS_USER}@${IOS_HOST} \
 	    'cd ${IOS_TMP} && DYLD_LIBRARY_PATH=. ${WRAPPER} ./tests'
@@ -164,14 +188,11 @@
 	if test -f ../src/runtime/libobjfwrt.so; then \
 		adb push ../src/runtime/libobjfwrt.so \
 		    /data/local/tmp/objfw/libobjfwrt.so.${OBJFWRT_LIB_MAJOR}; \
 	fi
 	adb push tests /data/local/tmp/objfw/tests
-	adb push testfile.bin /data/local/tmp/objfw/testfile.bin
 	adb push testfile.txt /data/local/tmp/objfw/testfile.txt
-	adb push testfile.ini /data/local/tmp/objfw/testfile.ini
-	adb push serialization.xml /data/local/tmp/objfw/serialization.xml
 	if test -f plugin/TestPlugin.so; then \
 		adb push plugin/TestPlugin.so \
 		    /data/local/tmp/objfw/plugin/TestPlugin.so; \
 	fi
 	echo "Running tests binary on Android device..."
@@ -185,24 +206,36 @@
 
 boot.dol: ${PROG_NOINST}
 	elf2dol ${PROG_NOINST} $@
 
 ${PROG_NOINST}: ${LIBOBJFW_DEP} ${LIBOBJFWRT_DEP}
+
+${PROG_NOINST}.3dsx: ${PROG_NOINST}
+	3dsxtool $< $@
 
 ${PROG_NOINST}.arm9: ${PROG_NOINST}
 	arm-none-eabi-objcopy -O binary $< $@
 
-${PROG_NOINST}.nds: ${PROG_NOINST}.arm9
+${PROG_NOINST}.nds: ${PROG_NOINST}.arm9 testfile.txt
 	rm -fr nds-data
 	mkdir -p nds-data
-	cp testfile.bin testfile.txt testfile.ini serialization.xml nds-data
-	ndstool -c $@ -9 $< -d nds-data
+	cp testfile.txt nds-data
+	ndstool -c $@ -9 ${PROG_NOINST} -d nds-data
 	rm -fr nds-data
 
-${PROG_NOINST}.3dsx: ${PROG_NOINST}
-	3dsxtool $< $@
+${PROG_NOINST}.nro: ${PROG_NOINST} testfile.txt
+	rm -fr romfs
+	mkdir -p romfs
+	cp testfile.txt romfs
+	nacptool --create "ObjFW tests" "Jonathan Schleifer" \
+		"${PACKAGE_VERSION}" tests.nacp
+	elf2nro ${PROG_NOINST} $@ --nacp=tests.nacp --romfsdir=romfs
+	rm -fr romfs tests.nacp
+
+${PROG_NOINST}.rpx: ${PROG_NOINST}
+	elf2rpl $< $@
 
 CPPFLAGS += -I../src -I../src/exceptions -I../src/runtime -I.. -DSTDOUT
 OBJCFLAGS_RuntimeARCTests.m = -fobjc-arc -fobjc-arc-exceptions
 LIBS := ${TESTS_LIBS} ${LIBS}
 LDFLAGS += ${MAP_LDFLAGS}
 LD = ${OBJC}