From 134e54dcbbff1a79608619d16d9476cdfe8d5d82 Mon Sep 17 00:00:00 2001 From: "Magomed Kostoev (mkostoevr)" Date: Sat, 27 Nov 2021 09:33:11 +0000 Subject: [PATCH] [KERNEL][TEST] Save UMKa C objects in umka/build/ git-svn-id: svn://kolibrios.org@9330 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/runtests.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/kernel/trunk/runtests.py b/kernel/trunk/runtests.py index e6dfed67e2..a1f1012cc2 100755 --- a/kernel/trunk/runtests.py +++ b/kernel/trunk/runtests.py @@ -192,7 +192,7 @@ def build_umka(): return if os.path.exists("umka_shell"): return - os.makedirs("umka/build", exist_ok = True) + os.makedirs("umka/build/linux", exist_ok = True) sources = [ "umka_shell.c", "shell.c", "trace.c", @@ -204,11 +204,15 @@ def build_umka(): "linux/thread.c", "util.c" ] sources = [f"umka/{f}" for f in sources] + objects = [] for source in sources: - gcc(source, f"{source}.o") - objects = " ".join([ f"{s}.o" for s in sources ]) + object_path = source.replace("umka/", "umka/build/") + object_path = f"{object_path}.o" + gcc(source, object_path) + objects.append(object_path) build_umka_asm() - objects += " umka/build/umka.o" + objects.append("umka/build/umka.o") + objects = " ".join(objects) os.system(f"gcc -m32 -no-pie -o umka_shell -static -T umka/umka.ld {objects}") def run_umka_test(test_file_path):