From 3bbbcf412f30af2ef1dce9bd55cd5579a876e0a7 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Tue, 30 Sep 2025 05:21:53 -0300 Subject: [PATCH 1/3] Add a filesystem config for testing --- config/aarch64/tests.toml | 14 +++++++ config/i686/tests.toml | 14 +++++++ config/riscv64gc/tests.toml | 14 +++++++ config/tests.toml | 78 +++++++++++++++++++++++++++++++++++++ config/x86_64/tests.toml | 14 +++++++ 5 files changed, 134 insertions(+) create mode 100644 config/aarch64/tests.toml create mode 100644 config/i686/tests.toml create mode 100644 config/riscv64gc/tests.toml create mode 100644 config/tests.toml create mode 100644 config/x86_64/tests.toml diff --git a/config/aarch64/tests.toml b/config/aarch64/tests.toml new file mode 100644 index 000000000..9af06ab91 --- /dev/null +++ b/config/aarch64/tests.toml @@ -0,0 +1,14 @@ +# Configuration for testing + +include = ["../tests.toml"] + +# Override the default settings here + +# General settings +[general] +# Filesystem size in MiB +# filesystem_size = 10000 + +# Package settings +[packages] +# example = {} diff --git a/config/i686/tests.toml b/config/i686/tests.toml new file mode 100644 index 000000000..9af06ab91 --- /dev/null +++ b/config/i686/tests.toml @@ -0,0 +1,14 @@ +# Configuration for testing + +include = ["../tests.toml"] + +# Override the default settings here + +# General settings +[general] +# Filesystem size in MiB +# filesystem_size = 10000 + +# Package settings +[packages] +# example = {} diff --git a/config/riscv64gc/tests.toml b/config/riscv64gc/tests.toml new file mode 100644 index 000000000..9af06ab91 --- /dev/null +++ b/config/riscv64gc/tests.toml @@ -0,0 +1,14 @@ +# Configuration for testing + +include = ["../tests.toml"] + +# Override the default settings here + +# General settings +[general] +# Filesystem size in MiB +# filesystem_size = 10000 + +# Package settings +[packages] +# example = {} diff --git a/config/tests.toml b/config/tests.toml new file mode 100644 index 000000000..94c8e06ff --- /dev/null +++ b/config/tests.toml @@ -0,0 +1,78 @@ +# Configuration for testing + +include = ["server.toml"] + +# General settings +[general] +# Filesystem size in MiB +filesystem_size = 10000 +# Do not prompt if settings are not defined +prompt = false + +# Package settings +[packages] +acid = {} +resist = {} +relibc-tests = {} +os-test = {} +openposixtestsuite = {} +redox-posix-tests = {} +vttest = {} +benchmarks = {} + +[[files]] +path = "/home/user/test.rs" +data = """ +fn main() { + println!("Hello, Redox!"); +} +""" + +[[files]] +path = "/home/user/test.c" +data = """ +#include + +int main(void) { + printf("Hello, Redox!\\n"); +} +""" + +[[files]] +path = "/home/user/test.cpp" +data = """ +#include + +int main() +{ + std::cout << "Hello, Redox!" << std::endl; +} +""" + +[[files]] +path = "/home/user/test.py" +data = """ +print("Hello, Redox!") +""" + +[[files]] +path = "/home/user/test.lua" +data = """ +print("Hello, Redox!") +""" + +[[files]] +path = "/home/user/test.js" +data = """ +console.log("Hello Redox"); +""" + +[[files]] +path = "/home/user/test.java" +data = """ +public class Java { + public static void main(String[] args) { + System.out.println("Hello Redox"); + } +} +""" diff --git a/config/x86_64/tests.toml b/config/x86_64/tests.toml new file mode 100644 index 000000000..9af06ab91 --- /dev/null +++ b/config/x86_64/tests.toml @@ -0,0 +1,14 @@ +# Configuration for testing + +include = ["../tests.toml"] + +# Override the default settings here + +# General settings +[general] +# Filesystem size in MiB +# filesystem_size = 10000 + +# Package settings +[packages] +# example = {} From ee1505187cf366740a1c1d2d92dd78ee6900c41a Mon Sep 17 00:00:00 2001 From: Ribbon Date: Tue, 30 Sep 2025 05:30:07 -0300 Subject: [PATCH 2/3] Move compilation tests to "hello-redox" folder --- config/tests.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config/tests.toml b/config/tests.toml index 94c8e06ff..007dff712 100644 --- a/config/tests.toml +++ b/config/tests.toml @@ -21,7 +21,7 @@ vttest = {} benchmarks = {} [[files]] -path = "/home/user/test.rs" +path = "/home/user/hello-redox/test.rs" data = """ fn main() { println!("Hello, Redox!"); @@ -29,7 +29,7 @@ fn main() { """ [[files]] -path = "/home/user/test.c" +path = "/home/user/hello-redox/test.c" data = """ #include @@ -39,7 +39,7 @@ int main(void) { """ [[files]] -path = "/home/user/test.cpp" +path = "/home/user/hello-redox/test.cpp" data = """ #include @@ -50,25 +50,25 @@ int main() """ [[files]] -path = "/home/user/test.py" +path = "/home/user/hello-redox/test.py" data = """ print("Hello, Redox!") """ [[files]] -path = "/home/user/test.lua" +path = "/home/user/hello-redox/test.lua" data = """ print("Hello, Redox!") """ [[files]] -path = "/home/user/test.js" +path = "/home/user/hello-redox/test.js" data = """ console.log("Hello Redox"); """ [[files]] -path = "/home/user/test.java" +path = "/home/user/hello-redox/test.java" data = """ public class Java { public static void main(String[] args) { From 09554f0cacbfd4b7e1b712599aa52b71a8206cf2 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Tue, 30 Sep 2025 06:54:32 -0300 Subject: [PATCH 3/3] Use hello-redox recipe --- config/tests.toml | 58 +---------------------------------------------- 1 file changed, 1 insertion(+), 57 deletions(-) diff --git a/config/tests.toml b/config/tests.toml index 007dff712..f47a0c72f 100644 --- a/config/tests.toml +++ b/config/tests.toml @@ -19,60 +19,4 @@ openposixtestsuite = {} redox-posix-tests = {} vttest = {} benchmarks = {} - -[[files]] -path = "/home/user/hello-redox/test.rs" -data = """ -fn main() { - println!("Hello, Redox!"); -} -""" - -[[files]] -path = "/home/user/hello-redox/test.c" -data = """ -#include - -int main(void) { - printf("Hello, Redox!\\n"); -} -""" - -[[files]] -path = "/home/user/hello-redox/test.cpp" -data = """ -#include - -int main() -{ - std::cout << "Hello, Redox!" << std::endl; -} -""" - -[[files]] -path = "/home/user/hello-redox/test.py" -data = """ -print("Hello, Redox!") -""" - -[[files]] -path = "/home/user/hello-redox/test.lua" -data = """ -print("Hello, Redox!") -""" - -[[files]] -path = "/home/user/hello-redox/test.js" -data = """ -console.log("Hello Redox"); -""" - -[[files]] -path = "/home/user/hello-redox/test.java" -data = """ -public class Java { - public static void main(String[] args) { - System.out.println("Hello Redox"); - } -} -""" +hello-redox = {}