Some test improvements

config/aarch64/acid.toml

@@ -1,3 +1,3 @@
-# Configuration to run the "acid" tests
+# Configuration for "acid" testing
 
 include = ["../acid.toml"]

config/aarch64/auto-test.toml

@@ -0,0 +1,3 @@
+# Configuration for automated testing of essential test suites
+
+include = ["../auto-test.toml"]

config/aarch64/os-test.toml

@@ -0,0 +1,14 @@
+# Configuration for "os-test" testing
+
+include = ["../os-test.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/aarch64/resist.toml

@@ -1,3 +0,0 @@
-# Configuration to run the "resist" tests
-
-include = ["../resist.toml"]

config/acid.toml

@@ -1,11 +1,11 @@
-# Configuration to run the "acid" tests
+# Configuration for "acid" testing
 
-include = ["base.toml"]
+include = ["net.toml"]
 
 # General settings
 [general]
 # Filesystem size in MiB
-filesystem_size = 256
+filesystem_size = 1024
 
 # Package settings
 [packages]
@@ -17,10 +17,7 @@ ion = {}
 path = "/usr/lib/init.d/10_acid"
 data = """
 export RUST_BACKTRACE full
-acid
-acid create_test
-acid switch
-acid tls
-acid thread
+cd /home/user/acid
+cargo test
 shutdown
 """

config/auto-test.toml

@@ -0,0 +1,27 @@
+# Configuration for automated testing of essential test suites
+
+include = ["net.toml"]
+
+# General settings
+[general]
+# Filesystem size in MiB
+filesystem_size = 1024
+
+# Package settings
+[packages]
+acid = {}
+coreutils = {}
+ion = {}
+os-test-bins = {}
+relibc-tests-bins = {}
+
+[[files]]
+path = "/usr/lib/init.d/30_console"
+data = """
+export RUST_BACKTRACE full
+cd /home/user/acid
+cargo test
+bash /root/relibc-tests/run.sh
+os-test-runner
+shutdown
+"""

config/i586/acid.toml

@@ -1,3 +1,3 @@
-# Configuration to run the "acid" tests
+# Configuration for "acid" testing
 
 include = ["../acid.toml"]

config/i586/auto-test.toml

@@ -0,0 +1,3 @@
+# Configuration for automated testing of essential test suites
+
+include = ["../auto-test.toml"]

config/i586/os-test.toml

@@ -0,0 +1,14 @@
+# Configuration for "os-test" testing
+
+include = ["../os-test.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/i586/resist.toml

@@ -1,3 +0,0 @@
-# Configuration to use the "resist" tests
-
-include = ["../resist.toml"]

config/os-test.toml

@@ -1,4 +1,4 @@
-# Configuration for testing
+# Configuration for "os-test" testing
 
 include = ["server.toml"]
 
@@ -16,6 +16,7 @@ os-test-bins = {} # Provides source and cross-compiled binaries
 [[files]]
 path = "/usr/lib/init.d/30_console"
 data = """
+export RUST_BACKTRACE full
 os-test-runner
 shutdown
 """

config/resist.toml

@@ -1,39 +0,0 @@
-# Configuration to run the "resist" tests
-
-include = ["net.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 256
-
-# Package settings
-[packages]
-bash = {}
-coreutils = {}
-diffutils = {}
-extrautils = {}
-findutils = {}
-gcc13 = {}
-gnu-binutils = {}
-gnu-make = {}
-netdb = {}
-resist = {}
-
-# Override to not background dhcpd
-[[files]]
-path = "/usr/lib/init.d/10_net"
-data = """
-notify smolnetd
-dhcpd
-"""
-
-[[files]]
-path = "/usr/lib/init.d/20_resist"
-data = """
-export RUST_BACKTRACE full
-resist /share/resist/redox/spec.toml
-resist /share/resist/posix/base.toml
-resist /share/resist/posix/shell.toml
-shutdown
-"""

config/riscv64gc/acid.toml

@@ -0,0 +1,3 @@
+# Configuration for "acid" testing
+
+include = ["../acid.toml"]

config/riscv64gc/auto-test.toml

@@ -0,0 +1,3 @@
+# Configuration for automated testing of essential test suites
+
+include = ["../auto-test.toml"]

config/riscv64gc/os-test.toml

@@ -0,0 +1,14 @@
+# Configuration for "os-test" testing
+
+include = ["../os-test.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/x86_64/acid.toml

@@ -1,3 +1,3 @@
-# Configuration to use the "acid" tests
+# Configuration for "acid" testing
 
 include = ["../acid.toml"]

config/x86_64/auto-test.toml

@@ -0,0 +1,3 @@
+# Configuration for automated testing of essential test suites
+
+include = ["../auto-test.toml"]

config/x86_64/os-test.toml

@@ -1,4 +1,4 @@
-# Configuration for testing
+# Configuration for "os-test" testing
 
 include = ["../os-test.toml"]
 

config/x86_64/resist.toml

@@ -1,3 +0,0 @@
-# Configuration to run the "resist" tests
-
-include = ["../resist.toml"]

recipes/dev/hello-world-examples/recipe.toml

@@ -1,8 +1,9 @@
 [source]
 git = "https://github.com/leachim6/hello-world"
+shallow_clone = true
 [build]
 template = "custom"
 script = """
-mkdir -pv "${COOKBOOK_STAGE}"/usr/share/hello-world-examples
-cp -rv "${COOKBOOK_SOURCE}"/[#,a-z] "${COOKBOOK_STAGE}"/usr/share/hello-world-examples
+mkdir -pv "${COOKBOOK_STAGE}"/home/user/hello-world-examples
+cp -rv "${COOKBOOK_SOURCE}"/[#,a-z] "${COOKBOOK_STAGE}"/home/user/hello-world-examples
 """

recipes/tests/acid-bins/recipe.toml

@@ -0,0 +1,4 @@
+[source]
+same_as = "../acid"
+[build]
+template = "cargo"

recipes/tests/acid/recipe.toml

@@ -1,5 +1,13 @@
+# Due to necessary write permission for compilation the filesystem path of source code installation is an exception
+# where the package manager can't switch between system-wide and user paths
 [source]
 git = "https://gitlab.redox-os.org/redox-os/acid.git"
-
+shallow_clone = true
 [build]
-template = "cargo"
+template = "custom"
+script = """
+mkdir -pv "${COOKBOOK_STAGE}/home/user/acid"
+cp -rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/home/user/acid"
+"""
+[package]
+dependencies = ["rust"]

recipes/tests/hello-redox/recipe.toml

@@ -1,3 +1,5 @@
+# Due to necessary write permission for compilation the filesystem path of source code installation is an exception
+# where the package manager can't switch between system-wide and user paths
 [build]
 template = "custom"
 script = """

recipes/tests/openposixtestsuite/recipe.toml

@@ -1,3 +1,5 @@
+# Due to necessary write permission for compilation the filesystem path of source code installation is an exception
+# where the package manager can't switch between system-wide and user paths
 [source]
 git = "https://gitlab.redox-os.org/redox-os/openposixtestsuite.git"
 branch = "redox"
@@ -5,8 +7,8 @@ branch = "redox"
 [build]
 template = "custom"
 script = """
-mkdir -pv "${COOKBOOK_STAGE}/share/openposixtestsuite"
-cp -rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/share/openposixtestsuite"
+mkdir -pv "${COOKBOOK_STAGE}/home/user/openposixtestsuite"
+cp -rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/home/user/openposixtestsuite"
 """
 
 [package]

recipes/tests/os-test/recipe.toml

@@ -1,3 +1,5 @@
+# Due to necessary write permission for compilation the filesystem path of source code installation is an exception
+# where the package manager can't switch between system-wide and user paths
 # TODO remove gnu-grep when extrautils grep supports grep -E
 [source]
 git = "https://gitlab.com/sortix/os-test"
@@ -5,8 +7,8 @@ git = "https://gitlab.com/sortix/os-test"
 [build]
 template = "custom"
 script = """
-mkdir -pv "${COOKBOOK_STAGE}/share/os-test"
-cp -rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/share/os-test"
+mkdir -pv "${COOKBOOK_STAGE}/home/user/os-test"
+cp -rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/home/user/os-test"
 """
 
 [package]

recipes/tests/redox-posix-tests/recipe.toml

@@ -5,8 +5,8 @@ git = "https://gitlab.redox-os.org/redox-os/redox-posix-tests.git"
 [build]
 template = "custom"
 script = """
-mkdir -pv "${COOKBOOK_STAGE}/share/redox-posix-tests"
-cp -rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/share/redox-posix-tests"
+mkdir -pv "${COOKBOOK_STAGE}/home/user/redox-posix-tests"
+cp -rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/home/user/redox-posix-tests"
 """
 
 [package]

recipes/tests/relibc-tests/recipe.toml

@@ -1,9 +1,14 @@
+# Due to necessary write permission for compilation the filesystem path of source code installation is an exception
+# where the package manager can't switch between system-wide and user paths
 [source]
 same_as = "../../core/relibc"
 
 [build]
 template = "custom"
 script = """
-mkdir -pv "${COOKBOOK_STAGE}/share/relibc"
-cp -rv "${COOKBOOK_SOURCE}/tests" "${COOKBOOK_STAGE}/share/relibc-tests"
+mkdir -pv "${COOKBOOK_STAGE}/home/user/relibc-tests"
+cp -rv "${COOKBOOK_SOURCE}/tests" "${COOKBOOK_STAGE}/home/user/relibc-tests"
 """
+
+[package]
+dependencies = ["gcc13"]

recipes/tests/resist/recipe.toml

@@ -1,10 +0,0 @@
-[source]
-git = "https://gitlab.redox-os.org/redox-os/resist.git"
-
-[build]
-template = "custom"
-script = """
-cookbook_cargo
-mkdir -pv "${COOKBOOK_STAGE}/share/resist"
-cp -rv "${COOKBOOK_SOURCE}/"{posix,redox} "${COOKBOOK_STAGE}/share/resist"
-"""