Overview
| Comment: | tests: Embed testfile.ini as well |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
942f77abbe8e74907472511f6799fad3 |
| User & Date: | js on 2022-08-07 16:04:03 |
| Other Links: | manifest | tags |
Context
|
2022-08-07
| ||
| 16:10 | OFINIFile: Remove dependency on support for files (check-in: ddbeb14059 user: js tags: trunk) | |
| 16:04 | tests: Embed testfile.ini as well (check-in: 942f77abbe user: js tags: trunk) | |
| 15:59 | OFINIFile: Use URLs instead of paths (check-in: 28942b4055 user: js tags: trunk) | |
Changes
Modified tests/Makefile from [1653b8f426] to [eba4233c5f].
1 2 3 4 5 6 7 8 9 10 11 12 13 |
include ../extra.mk
SUBDIRS = ${TESTPLUGIN} \
${OBJC_SYNC} \
terminal
CLEAN = EBOOT.PBP \
boot.dol \
${PROG_NOINST}.arm9 \
${PROG_NOINST}.nds \
${PROG_NOINST}.nro \
${PROG_NOINST}.rpx \
serialization_xml.m \
| | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 |
include ../extra.mk
SUBDIRS = ${TESTPLUGIN} \
${OBJC_SYNC} \
terminal
CLEAN = EBOOT.PBP \
boot.dol \
${PROG_NOINST}.arm9 \
${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 \
OFArrayTests.m \
${OF_BLOCK_TESTS_M} \
|
| ︙ | ︙ | |||
58 59 60 61 62 63 64 |
TestsAppDelegate.m \
${USE_SRCS_FILES} \
${USE_SRCS_PLUGINS} \
${USE_SRCS_SOCKETS} \
${USE_SRCS_THREADS} \
${USE_SRCS_WINDOWS} \
serialization_xml.m \
| | > | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 |
TestsAppDelegate.m \
${USE_SRCS_FILES} \
${USE_SRCS_PLUGINS} \
${USE_SRCS_SOCKETS} \
${USE_SRCS_THREADS} \
${USE_SRCS_WINDOWS} \
serialization_xml.m \
testfile_bin.m \
testfile_ini.m
SRCS_FILES = OFINIFileTests.m
SRCS_PLUGINS = OFPluginTests.m
SRCS_SOCKETS = OFDNSResolverTests.m \
${OF_HTTP_CLIENT_TESTS_M} \
OFHTTPCookieTests.m \
OFHTTPCookieManagerTests.m \
OFKernelEventObserverTests.m \
|
| ︙ | ︙ | |||
88 89 90 91 92 93 94 95 96 97 98 99 100 101 |
include ../buildsys.mk
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 $@
.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${OBJFW_LIB_MAJOR}.dll libobjfw.${OBJFW_LIB_MAJOR}.dylib
rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR}
| > > | 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 |
include ../buildsys.mk
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${OBJFW_LIB_MAJOR}.dll libobjfw.${OBJFW_LIB_MAJOR}.dylib
rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR}
|
| ︙ | ︙ | |||
162 163 164 165 166 167 168 |
fi
echo "Uploading files to iOS device ${IOS_HOST} at ${IOS_TMP}..."
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
| | < < | 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 |
fi
echo "Uploading files to iOS device ${IOS_HOST} at ${IOS_TMP}..."
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.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'
run-on-android: all
echo "Uploading files to Android device..."
if test -f ../src/libobjfw.so; then \
adb push ../src/libobjfw.so \
/data/local/tmp/objfw/libobjfw.so.${OBJFW_LIB_MAJOR}; \
fi
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.txt /data/local/tmp/objfw/testfile.txt
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..."
adb shell 'cd /data/local/tmp/objfw && LD_LIBRARY_PATH=. exec ${WRAPPER} ./tests'
|
| ︙ | ︙ | |||
207 208 209 210 211 212 213 |
${PROG_NOINST}.3dsx: ${PROG_NOINST}
3dsxtool $< $@
${PROG_NOINST}.arm9: ${PROG_NOINST}
arm-none-eabi-objcopy -O binary $< $@
| | | | | | 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 |
${PROG_NOINST}.3dsx: ${PROG_NOINST}
3dsxtool $< $@
${PROG_NOINST}.arm9: ${PROG_NOINST}
arm-none-eabi-objcopy -O binary $< $@
${PROG_NOINST}.nds: ${PROG_NOINST}.arm9 testfile.txt
rm -fr nds-data
mkdir -p nds-data
cp testfile.txt nds-data
ndstool -c $@ -9 ${PROG_NOINST} -d nds-data
rm -fr nds-data
${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}
|
Modified tests/OFINIFileTests.m from [0f67b17e7c] to [005c336f0c].
| ︙ | ︙ | |||
49 50 51 52 53 54 55 | OFArray *array; #ifndef OF_NINTENDO_DS OFURL *writeURL; #endif module = @"OFINIFile"; | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | OFArray *array; #ifndef OF_NINTENDO_DS OFURL *writeURL; #endif module = @"OFINIFile"; URL = [OFURL URLWithString: @"objfw-embedded:///testfile.ini"]; TEST(@"+[fileWithURL:encoding:]", (file = [OFINIFile fileWithURL: URL encoding: OFStringEncodingCodepage437])) tests = [file categoryForName: @"tests"]; foobar = [file categoryForName: @"foobar"]; types = [file categoryForName: @"types"]; |
| ︙ | ︙ |