From a70a91b6f87e8d3abd6599c29f716b8b2bb5e2b4 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Mon, 1 Oct 2018 17:34:17 -0400 Subject: [PATCH] Minor cleanup (README & .gitignore) --- .gitignore | 8 +++++--- README | 7 +++++-- kernel/tests/stdio.c | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 21af017..b0ecba3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -.vscode +.vscode/ *.a *.bin *.img @@ -7,7 +7,9 @@ cmake_install.cmake CMakeFiles Makefile *.cbp -.idea +.idea/ *.iso iso/ -target/ \ No newline at end of file +target/ +build/ +/*.png \ No newline at end of file diff --git a/README b/README index 6291ae0..cee2fa3 100644 --- a/README +++ b/README @@ -1,4 +1,7 @@ -cmake -DCMAKE_BUILD_TYPE=Debug . +mkdir build && cd build +cmake -DCMAKE_BUILD_TYPE=Debug .. +cd .. +make -C build # directly qemu-system-i386 -kernel kernel.bin @@ -21,7 +24,7 @@ qemu-system-i386 -cdrom os.iso # ----------------- # Full example: -make && ./mkiso.sh kernel.bin && ./mkhd.sh kernel.bin && \ +make -C build && ./mkiso.sh build/kernel.bin && ./mkhd.sh build/kernel.bin && \ qemu-system-i386 -cdrom os.iso -serial stdio \ -device isa-debug-exit,iobase=0xf4,iosize=0x04 \ -drive file=hd.img,if=ide,format=raw -boot d \ No newline at end of file diff --git a/kernel/tests/stdio.c b/kernel/tests/stdio.c index 9c1e084..b15e0af 100644 --- a/kernel/tests/stdio.c +++ b/kernel/tests/stdio.c @@ -103,7 +103,7 @@ static bool fwrite_test() { } bool stdio_test() { - return fstat_test() && - fread_test() && + return fstat_test() && + fread_test() && fwrite_test(); } \ No newline at end of file