testsuite: Install test data for test431 into the datadir

Netatalk · Oct 30, 2024 · 54b2274 · 54b2274
1 parent cf691f3
commit 54b2274
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/meson.build b/meson.build
@@ -2129,6 +2129,7 @@ endif
 cdata.set('bindir', bindir)
 cdata.set('etcdir', pkgconfdir)
 cdata.set('exec_prefix', exec_prefix)
+cdata.set('datadir', datadir)
 cdata.set('homedir', homedir)
 cdata.set('libdir', libdir)
 cdata.set('includedir', includedir)

diff --git a/test/testsuite/T2_FPOpenFork.c → test/testsuite/T2_FPOpenFork.c.in b/test/testsuite/T2_FPOpenFork.c → test/testsuite/T2_FPOpenFork.c.in
@@ -1349,13 +1349,6 @@ STATIC void test431()
 
 	ENTER_TEST
 
-	if (!Test) {
-		if (!Quiet) {
-			fprintf(stdout, "test431_data must be present in volume.\n");
-		}
-		test_skipped(T_SINGLE);
-		goto test_exit;
-	}
 	if (!Mac && Path[0] == '\0') {
 		test_skipped(T_MAC_PATH);
 		goto test_exit;
@@ -1388,7 +1381,7 @@ STATIC void test431()
     }
 
     /* Copy resource fork */
-    if (snprintf(cmd, sizeof(cmd), "mv %s/test431_data %s/.AppleDouble/%s", Path, Path, name) > sizeof(cmd)) {
+    if (snprintf(cmd, sizeof(cmd), "mv @datadir@/netatalk/test-data/test431_data %s/.AppleDouble/%s", Path, name) > sizeof(cmd)) {
 	if (!Quiet) {
 		fprintf(stdout,"FPOpenFork:test431: path too long\n");
 	}

diff --git a/test/testsuite/data/meson.build b/test/testsuite/data/meson.build
@@ -0,0 +1,4 @@
+install_data(
+    'test431_data',
+    install_dir: datadir / 'test-data' / 'netatalk',
+)
diff --git a/test/testsuite/meson.build b/test/testsuite/meson.build
@@ -1,3 +1,11 @@
+subdir('data')
+
+t2_fpopenfork_c = configure_file(
+    input: 'T2_FPOpenFork.c.in',
+    output: 'T2_FPOpenFork.c',
+    configuration: cdata,
+)
+
 afptest_external_deps = []
 
 if threads.found()
@@ -151,7 +159,6 @@ spectest_sources = [
     'T2_FPDelete.c',
     'T2_FPGetFileDirParms.c',
     'T2_FPGetSrvrParms.c',
-    'T2_FPOpenFork.c',
     'T2_FPSetDirParms.c',
     'T2_FPSetFileParms.c',
 	'T2_FPMoveAndRename.c',
@@ -162,6 +169,7 @@ spectest_sources = [
     'T2_Dircache_attack.c',
     'T2_FPRead.c',
     'T2_FPSetForkParms.c',
+    t2_fpopenfork_c,
 ]
 
 executable(