1.1 --- a/conf/dstest_exec.cfg Wed Jan 17 00:53:24 2024 +0100
1.2 +++ b/conf/dstest_exec.cfg Wed Jan 17 18:56:05 2024 +0100
1.3 @@ -54,7 +54,7 @@
1.4 },
1.5 log = { "process", "y" },
1.6 },
1.7 - "rom/process_server", "home/paulb/exec_region_mapper");
1.8 + "rom/process_server", "bin/exec_region_mapper");
1.9
1.10 l:startv({
1.11 caps = {
1.12 @@ -64,4 +64,4 @@
1.13 },
1.14 log = { "client", "g" },
1.15 },
1.16 - "rom/dstest_exec", "home/paulb/dstest_exec_payload", "home/paulb/LICENCE.txt", "21");
1.17 + "rom/dstest_exec", "bin/dstest_exec_payload", "home/paulb/LICENCE.txt", "21");
2.1 --- a/conf/dstest_exec_many.cfg Wed Jan 17 00:53:24 2024 +0100
2.2 +++ b/conf/dstest_exec_many.cfg Wed Jan 17 18:56:05 2024 +0100
2.3 @@ -54,7 +54,7 @@
2.4 },
2.5 log = { "process", "y" },
2.6 },
2.7 - "rom/process_server", "home/paulb/exec_region_mapper");
2.8 + "rom/process_server", "bin/exec_region_mapper");
2.9
2.10 l:startv({
2.11 caps = {
2.12 @@ -63,4 +63,4 @@
2.13 },
2.14 log = { "client", "g" },
2.15 },
2.16 - "rom/dstest_exec_many", "20", "home/paulb/clip", "home/paulb/LICENCE.txt", "21", "1");
2.17 + "rom/dstest_exec_many", "20", "bin/clip", "home/paulb/LICENCE.txt", "21", "1");
3.1 --- a/conf/dstest_fsaccess.cfg Wed Jan 17 00:53:24 2024 +0100
3.2 +++ b/conf/dstest_fsaccess.cfg Wed Jan 17 18:56:05 2024 +0100
3.3 @@ -54,7 +54,7 @@
3.4 },
3.5 log = { "process", "y" },
3.6 },
3.7 - "rom/process_server", "home/paulb/exec_region_mapper");
3.8 + "rom/process_server", "bin/exec_region_mapper");
3.9
3.10 l:startv({
3.11 caps = {
4.1 --- a/conf/dstest_fsaccess_stdin.cfg Wed Jan 17 00:53:24 2024 +0100
4.2 +++ b/conf/dstest_fsaccess_stdin.cfg Wed Jan 17 18:56:05 2024 +0100
4.3 @@ -54,7 +54,7 @@
4.4 },
4.5 log = { "process", "y" },
4.6 },
4.7 - "rom/process_server", "home/paulb/exec_region_mapper");
4.8 + "rom/process_server", "bin/exec_region_mapper");
4.9
4.10 l:startv({
4.11 log = L4.Env.log,
5.1 --- a/test_files/Makefile Wed Jan 17 00:53:24 2024 +0100
5.2 +++ b/test_files/Makefile Wed Jan 17 18:56:05 2024 +0100
5.3 @@ -15,6 +15,8 @@
5.4
5.5 L4_SYSTEM = $(BUILD_ARCH)_$(CPU)
5.6
5.7 +FS_SCRIPT = $(PKGDIR)/mk_e2test.sh
5.8 +
5.9 PROGRAMS_DIR = $(PKGDIR_OBJ)/programs/OBJ-$(L4_SYSTEM)-l4f
5.10 PROGRAMS = $(foreach PROGRAM,$(wildcard $(PROGRAMS_DIR)/*),$(if $(shell test -x $(PROGRAM) && echo "Y"),$(PROGRAM),))
5.11
5.12 @@ -26,9 +28,9 @@
5.13
5.14 all:: $(TARGET) $(PROGRAMS_DIR)
5.15
5.16 -$(TARGET): $(PROGRAMS_DIR) $(RM_PROGRAM)
5.17 +$(TARGET): $(PROGRAMS_DIR) $(RM_PROGRAM) $(FS_SCRIPT)
5.18 $(MAKE) -C $(E2ACCESS_DIR) && \
5.19 - $(PKGDIR)/mk_e2test.sh -q $(PKGDIR) $(E2ACCESS_DIR) $@ \
5.20 + $(FS_SCRIPT) -q $(PKGDIR) $(E2ACCESS_DIR) $@ \
5.21 $(PROGRAMS) \
5.22 $(RM_PROGRAM)
5.23
6.1 --- a/test_files/mk_e2test.sh Wed Jan 17 00:53:24 2024 +0100
6.2 +++ b/test_files/mk_e2test.sh Wed Jan 17 18:56:05 2024 +0100
6.3 @@ -2,7 +2,7 @@
6.4
6.5 # Make a test filesystem.
6.6 #
6.7 -# Copyright (C) 2021, 2022 Paul Boddie <paul@boddie.org.uk>
6.8 +# Copyright (C) 2021, 2022, 2024 Paul Boddie <paul@boddie.org.uk>
6.9 #
6.10 # This program is free software; you can redistribute it and/or
6.11 # modify it under the terms of the GNU General Public License as
6.12 @@ -114,20 +114,24 @@
6.13
6.14 cp "$PKGDIR/../docs/LICENCE.txt" .
6.15
6.16 -# Put some programs in the same place.
6.17 +# Return to the top level.
6.18 +
6.19 +cd ../..
6.20 +
6.21 +# Create a top-level bin directory.
6.22 +
6.23 +mkdir bin
6.24 +
6.25 +# Put some programs in the bin directory.
6.26
6.27 for PROGRAM in $* ; do
6.28 - cp $(realpath "$PROGRAM") .
6.29 + cp $(realpath "$PROGRAM") bin
6.30 done
6.31
6.32 -# Leave the filesystem root.
6.33 -
6.34 -cd ../..
6.35 -
6.36 # Create a filesystem image.
6.37
6.38 EXTRA=2000
6.39 -SIZE=$(du -s -k home | cut -f 1)
6.40 +SIZE=$(du -s -k . | cut -f 1)
6.41 TOTAL=$(($SIZE + $EXTRA))
6.42
6.43 dd if=/dev/zero of="$TARGET" bs=1024 count=$TOTAL
6.44 @@ -138,7 +142,7 @@
6.45
6.46 # Add the directories and files to the image.
6.47
6.48 -for DIR in home/paulb home/paulb/private home/paulb/public home/paulb/shared home/paulb/many ; do
6.49 +for DIR in bin home/paulb home/paulb/private home/paulb/public home/paulb/shared home/paulb/many ; do
6.50 e2access mkdir "$DIR"
6.51 e2access copy-in $(find "$DIR" -maxdepth 1 -type f | sort) "$DIR"
6.52 done
6.53 @@ -149,6 +153,7 @@
6.54
6.55 if [ ! "$QUIET" ] ; then
6.56 e2access ls ''
6.57 + e2access ls 'bin'
6.58 e2access ls 'home'
6.59 e2access ls 'home/paulb'
6.60 e2access ls 'home/paulb/many'