diff --git a/config/aarch64/acid.toml b/config/aarch64/acid.toml index ef2ba347f..552a32d81 100644 --- a/config/aarch64/acid.toml +++ b/config/aarch64/acid.toml @@ -1,3 +1,3 @@ -# Configuration to run the "acid" tests +# Configuration for "acid" testing include = ["../acid.toml"] diff --git a/config/aarch64/auto-test.toml b/config/aarch64/auto-test.toml new file mode 100644 index 000000000..e7a4cbb66 --- /dev/null +++ b/config/aarch64/auto-test.toml @@ -0,0 +1,3 @@ +# Configuration for automated testing of essential test suites + +include = ["../auto-test.toml"] diff --git a/config/aarch64/os-test.toml b/config/aarch64/os-test.toml new file mode 100644 index 000000000..1765fb640 --- /dev/null +++ b/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 = {} diff --git a/config/aarch64/resist.toml b/config/aarch64/resist.toml deleted file mode 100644 index 60ac1e55b..000000000 --- a/config/aarch64/resist.toml +++ /dev/null @@ -1,3 +0,0 @@ -# Configuration to run the "resist" tests - -include = ["../resist.toml"] diff --git a/config/acid.toml b/config/acid.toml index e2853d75e..329d5be9b 100644 --- a/config/acid.toml +++ b/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 """ diff --git a/config/auto-test.toml b/config/auto-test.toml new file mode 100644 index 000000000..9f350f6fb --- /dev/null +++ b/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 +""" diff --git a/config/i586/acid.toml b/config/i586/acid.toml index ef2ba347f..552a32d81 100644 --- a/config/i586/acid.toml +++ b/config/i586/acid.toml @@ -1,3 +1,3 @@ -# Configuration to run the "acid" tests +# Configuration for "acid" testing include = ["../acid.toml"] diff --git a/config/i586/auto-test.toml b/config/i586/auto-test.toml new file mode 100644 index 000000000..e7a4cbb66 --- /dev/null +++ b/config/i586/auto-test.toml @@ -0,0 +1,3 @@ +# Configuration for automated testing of essential test suites + +include = ["../auto-test.toml"] diff --git a/config/i586/os-test.toml b/config/i586/os-test.toml new file mode 100644 index 000000000..1765fb640 --- /dev/null +++ b/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 = {} diff --git a/config/i586/resist.toml b/config/i586/resist.toml deleted file mode 100644 index 1eecccf9e..000000000 --- a/config/i586/resist.toml +++ /dev/null @@ -1,3 +0,0 @@ -# Configuration to use the "resist" tests - -include = ["../resist.toml"] diff --git a/config/os-test.toml b/config/os-test.toml index 73f25c285..c8f7e9634 100644 --- a/config/os-test.toml +++ b/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 """ diff --git a/config/resist.toml b/config/resist.toml deleted file mode 100644 index a7ece5707..000000000 --- a/config/resist.toml +++ /dev/null @@ -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 -""" diff --git a/config/riscv64gc/acid.toml b/config/riscv64gc/acid.toml new file mode 100644 index 000000000..552a32d81 --- /dev/null +++ b/config/riscv64gc/acid.toml @@ -0,0 +1,3 @@ +# Configuration for "acid" testing + +include = ["../acid.toml"] diff --git a/config/riscv64gc/auto-test.toml b/config/riscv64gc/auto-test.toml new file mode 100644 index 000000000..e7a4cbb66 --- /dev/null +++ b/config/riscv64gc/auto-test.toml @@ -0,0 +1,3 @@ +# Configuration for automated testing of essential test suites + +include = ["../auto-test.toml"] diff --git a/config/riscv64gc/os-test.toml b/config/riscv64gc/os-test.toml new file mode 100644 index 000000000..1765fb640 --- /dev/null +++ b/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 = {} diff --git a/config/x86_64/acid.toml b/config/x86_64/acid.toml index f89bdea88..552a32d81 100644 --- a/config/x86_64/acid.toml +++ b/config/x86_64/acid.toml @@ -1,3 +1,3 @@ -# Configuration to use the "acid" tests +# Configuration for "acid" testing include = ["../acid.toml"] diff --git a/config/x86_64/auto-test.toml b/config/x86_64/auto-test.toml new file mode 100644 index 000000000..e7a4cbb66 --- /dev/null +++ b/config/x86_64/auto-test.toml @@ -0,0 +1,3 @@ +# Configuration for automated testing of essential test suites + +include = ["../auto-test.toml"] diff --git a/config/x86_64/os-test.toml b/config/x86_64/os-test.toml index 23693cbec..1765fb640 100644 --- a/config/x86_64/os-test.toml +++ b/config/x86_64/os-test.toml @@ -1,4 +1,4 @@ -# Configuration for testing +# Configuration for "os-test" testing include = ["../os-test.toml"] diff --git a/config/x86_64/resist.toml b/config/x86_64/resist.toml deleted file mode 100644 index 60ac1e55b..000000000 --- a/config/x86_64/resist.toml +++ /dev/null @@ -1,3 +0,0 @@ -# Configuration to run the "resist" tests - -include = ["../resist.toml"] diff --git a/recipes/dev/hello-world-examples/recipe.toml b/recipes/dev/hello-world-examples/recipe.toml index b3fd95679..ad2d9f702 100644 --- a/recipes/dev/hello-world-examples/recipe.toml +++ b/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 """ diff --git a/recipes/tests/acid-bins/recipe.toml b/recipes/tests/acid-bins/recipe.toml new file mode 100644 index 000000000..42190ca8b --- /dev/null +++ b/recipes/tests/acid-bins/recipe.toml @@ -0,0 +1,4 @@ +[source] +same_as = "../acid" +[build] +template = "cargo" diff --git a/recipes/tests/acid/recipe.toml b/recipes/tests/acid/recipe.toml index 1f1262905..831335255 100644 --- a/recipes/tests/acid/recipe.toml +++ b/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"] diff --git a/recipes/tests/hello-redox/recipe.toml b/recipes/tests/hello-redox/recipe.toml index 6801e8339..2a526f917 100644 --- a/recipes/tests/hello-redox/recipe.toml +++ b/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 = """ diff --git a/recipes/tests/openposixtestsuite/recipe.toml b/recipes/tests/openposixtestsuite/recipe.toml index 3ff2cb7e7..e4c3df4a6 100644 --- a/recipes/tests/openposixtestsuite/recipe.toml +++ b/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] diff --git a/recipes/tests/os-test/recipe.toml b/recipes/tests/os-test/recipe.toml index 9b0d02354..f1de7947c 100644 --- a/recipes/tests/os-test/recipe.toml +++ b/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] diff --git a/recipes/tests/redox-posix-tests/recipe.toml b/recipes/tests/redox-posix-tests/recipe.toml index dae4b48cc..74f2e46f0 100644 --- a/recipes/tests/redox-posix-tests/recipe.toml +++ b/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] diff --git a/recipes/tests/relibc-tests/recipe.toml b/recipes/tests/relibc-tests/recipe.toml index c854833dd..99531ee1a 100644 --- a/recipes/tests/relibc-tests/recipe.toml +++ b/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"] diff --git a/recipes/tests/resist/recipe.toml b/recipes/tests/resist/recipe.toml deleted file mode 100644 index 7f0ecb237..000000000 --- a/recipes/tests/resist/recipe.toml +++ /dev/null @@ -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" -"""