Skip to content

Commit 08fc73d

Browse files
committed
Rename from YaROS to YaOS
Somehow YaOS feels cleaner and we also don't get in any conflict by using Rust in our name.
1 parent 2720cf5 commit 08fc73d

File tree

11 files changed

+37
-43
lines changed

11 files changed

+37
-43
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ default-members = ["kernel"]
88
resolver = "2"
99

1010
[workspace.package]
11-
description = "Yet another Rust Operating System (YaROS)"
12-
authors = ["Maurice Hieronymus <yaros@ilovebinary.com>"]
11+
description = "Yet another Operating System (YaOS)"
12+
authors = ["Maurice Hieronymus <yaos@ilovebinary.com>"]
1313
version = "0.1.0"
1414

1515
[profile.release]

kernel/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "yaros"
2+
name = "yaos"
33
edition = "2021"
44
version.workspace = true
55
authors.workspace = true

kernel/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ extern crate alloc;
5959
extern "C" fn kernel_init(hart_id: usize, device_tree_pointer: *const ()) {
6060
QEMU_UART.lock().init();
6161

62-
info!("Hello World from YaROS!\n");
62+
info!("Hello World from YaOS!\n");
6363
info!("Hart ID: {}", hart_id);
6464
info!("Device Tree Pointer: {:p}", device_tree_pointer);
6565

qemu_wrapper.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ while [[ $# -gt 0 ]]; do
2020
shift
2121
;;
2222
--log)
23-
QEMU_CMD+=" -d guest_errors,cpu_reset,unimp,int -D /tmp/yaros.log"
23+
QEMU_CMD+=" -d guest_errors,cpu_reset,unimp,int -D /tmp/yaos.log"
2424
shift
2525
;;
2626
--net)
@@ -36,7 +36,7 @@ while [[ $# -gt 0 ]]; do
3636
echo ""
3737
echo "Options:"
3838
echo " --gdb Let qemu listen on :1234 for gdb connections"
39-
echo " --log Log qemu events to /tmp/yaros.log"
39+
echo " --log Log qemu events to /tmp/yaos.log"
4040
echo " --capture Capture network traffic into network.pcap"
4141
echo " --net Enable network card"
4242
echo " -h, --help Show this help message"

readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# YaROS (Yet another RISC-V Operating System)
2-
[![ci](https://github.com/hieronymusma/yaros/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/hieronymusma/yaros/actions/workflows/ci.yml)
1+
# YaOS (Yet another Operating System)
2+
[![ci](https://github.com/hieronymusma/yaos/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/hieronymusma/yaos/actions/workflows/ci.yml)
33
This projects makes my dream come true - write my own operating system. I'm doing this mostly for fun, so don't expect a fully-fledged operating system on basis of the RISC-V architecture.
44
Exactly like [SerenityOS](https://github.com/SerenityOS/serenity) this project doesn't use third-party runtime dependencies. If third-party dependencies are used, then only for the Build.
55

system-tests/src/infra/qemu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ impl QemuInstance {
7070

7171
let mut stdout = ReadAsserter::new(stdout);
7272

73-
stdout.assert_read_until("Hello World from YaROS!").await;
73+
stdout.assert_read_until("Hello World from YaOS!").await;
7474
stdout.assert_read_until("kernel_init done!").await;
7575
stdout.assert_read_until("init process started").await;
7676
stdout

system-tests/src/tests/basics.rs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,21 @@ async fn boot_with_network() -> anyhow::Result<()> {
1717

1818
#[tokio::test]
1919
async fn shutdown() -> anyhow::Result<()> {
20-
let mut yaros = QemuInstance::start().await?;
20+
let mut yaos = QemuInstance::start().await?;
2121

22-
yaros
23-
.run_prog_waiting_for("exit", "shutting down system")
22+
yaos.run_prog_waiting_for("exit", "shutting down system")
2423
.await?;
2524

26-
assert!(yaros.wait_for_qemu_to_exit().await?.success());
25+
assert!(yaos.wait_for_qemu_to_exit().await?.success());
2726

2827
Ok(())
2928
}
3029

3130
#[tokio::test]
3231
async fn execute_program() -> anyhow::Result<()> {
33-
let mut yaros = QemuInstance::start().await?;
32+
let mut yaos = QemuInstance::start().await?;
3433

35-
let output = yaros.run_prog("prog1").await?;
34+
let output = yaos.run_prog("prog1").await?;
3635

3736
assert_eq!(output, "Hello from Prog1\n");
3837

@@ -41,27 +40,27 @@ async fn execute_program() -> anyhow::Result<()> {
4140

4241
#[tokio::test]
4342
async fn execute_same_program_twice() -> anyhow::Result<()> {
44-
let mut yaros = QemuInstance::start().await?;
43+
let mut yaos = QemuInstance::start().await?;
4544

4645
let expected = "Hello from Prog1\n";
4746

48-
let output = yaros.run_prog("prog1").await?;
47+
let output = yaos.run_prog("prog1").await?;
4948
assert_eq!(output, expected);
5049

51-
let output = yaros.run_prog("prog1").await?;
50+
let output = yaos.run_prog("prog1").await?;
5251
assert_eq!(output, expected);
5352

5453
Ok(())
5554
}
5655

5756
#[tokio::test]
5857
async fn execute_different_programs() -> anyhow::Result<()> {
59-
let mut yaros = QemuInstance::start().await?;
58+
let mut yaos = QemuInstance::start().await?;
6059

61-
let output = yaros.run_prog("prog1").await?;
60+
let output = yaos.run_prog("prog1").await?;
6261
assert_eq!(output, "Hello from Prog1\n");
6362

64-
let output = yaros.run_prog("prog2").await?;
63+
let output = yaos.run_prog("prog2").await?;
6564
assert_eq!(output, "Hello from Prog2\n");
6665

6766
Ok(())

system-tests/src/tests/net.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,28 @@ use crate::infra::qemu::{QemuInstance, QemuOptions};
66
#[file_serial]
77
#[tokio::test]
88
async fn udp() -> anyhow::Result<()> {
9-
let mut yaros = QemuInstance::start_with(QemuOptions::default().add_network_card(true)).await?;
9+
let mut yaos = QemuInstance::start_with(QemuOptions::default().add_network_card(true)).await?;
1010

11-
yaros
12-
.run_prog_waiting_for("udp", "Listening on 1234\n")
11+
yaos.run_prog_waiting_for("udp", "Listening on 1234\n")
1312
.await
1413
.expect("udp program must succeed to start");
1514

1615
let socket = tokio::net::UdpSocket::bind("127.0.0.1:0").await?;
1716
socket.connect("127.0.0.1:1234").await?;
1817

1918
socket.send("42\n".as_bytes()).await?;
20-
yaros.stdout().assert_read_until("42\n").await;
19+
yaos.stdout().assert_read_until("42\n").await;
2120

22-
yaros
23-
.stdin()
24-
.write("Hello from YaROS!\n".as_bytes())
25-
.await?;
21+
yaos.stdin().write("Hello from YaOS!\n".as_bytes()).await?;
2622

2723
let mut buf = [0; 128];
2824
let bytes = socket.recv(&mut buf).await?;
2925
let response = String::from_utf8_lossy(&buf[0..bytes]);
3026

31-
assert_eq!(response, "Hello from YaROS!\n");
27+
assert_eq!(response, "Hello from YaOS!\n");
3228

3329
socket.send("Finalize test\n".as_bytes()).await?;
34-
yaros.stdout().assert_read_until("Finalize test\n").await;
30+
yaos.stdout().assert_read_until("Finalize test\n").await;
3531

3632
Ok(())
3733
}

system-tests/src/tests/panic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use crate::infra::qemu::QemuInstance;
22

33
#[tokio::test]
44
async fn panic() -> anyhow::Result<()> {
5-
let mut yaros = QemuInstance::start().await?;
6-
let output = yaros
5+
let mut yaos = QemuInstance::start().await?;
6+
let output = yaos
77
.run_prog_waiting_for("panic", "Time to attach gdb ;) use 'just attach'")
88
.await?;
99

0 commit comments

Comments
 (0)