From 98d64b669d8e382c77bd60628309fda3f8f7299f Mon Sep 17 00:00:00 2001 From: "Magomed Kostoev (mkostoevr)" Date: Thu, 25 Nov 2021 23:04:42 +0000 Subject: [PATCH] [KERNEL][TEST] Fix makeflop usage and small details git-svn-id: svn://kolibrios.org@9317 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/runtests.py | 5 +---- kernel/trunk/test/common/makeflop.py | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/kernel/trunk/runtests.py b/kernel/trunk/runtests.py index bcc20d037e..54727ebba2 100755 --- a/kernel/trunk/runtests.py +++ b/kernel/trunk/runtests.py @@ -99,9 +99,6 @@ if __name__ == "__main__": with open("kolibri_test.img", "rb") as img: img_data = img.read() img = common.Floppy(img_data) - - # Remove old kernel (may fail if we removed it before so no check here) - img.delete_path("kernel.mnt") # Remove unuseful folders img.delete_path("GAMES") @@ -122,7 +119,7 @@ if __name__ == "__main__": # Put the kernel into IMG with open("kernel.mnt.pretest", "rb") as kernel_mnt_pretest: kernel_mnt_pretest_data = kernel_mnt_pretest.read() - img.add_file_path("kernel.mnt", kernel_mnt_pretest_data) + img.add_file_path("KERNEL.MNT", kernel_mnt_pretest_data) img.save("kolibri_test.img") # Collect tests from test folder (not recursively yet) diff --git a/kernel/trunk/test/common/makeflop.py b/kernel/trunk/test/common/makeflop.py index 7778ef3e58..1a4b53a7d8 100644 --- a/kernel/trunk/test/common/makeflop.py +++ b/kernel/trunk/test/common/makeflop.py @@ -90,9 +90,9 @@ class Floppy: self.path = "" self.incipit = data[0] if self.incipit != 0x00 and self.incipit != Floppy.EMPTY: - filename = data[0:8].decode("ASCII") + filename = data[0:8].decode("cp866") filename = filename.rstrip(" ") - extension = data[8:11].decode("ASCII") + extension = data[8:11].decode("cp866") extension = extension.rstrip(" ") self.path = filename if len(extension) > 0: