From 6d3a971e8d0fe405e24b32697f837dbe96c0c15f Mon Sep 17 00:00:00 2001 From: Esko Kokkonen Date: Tue, 29 Nov 2011 18:39:28 +0200 Subject: [PATCH] Add a simulation mode setting This allows for the testing of the program to check for possible errors and other things without actually running emerge --- emerge-timer.py | 49 +++++++++++++++++++++++++++++++++++++--- simulate/fake_emerge.log | 42 ++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 simulate/fake_emerge.log diff --git a/emerge-timer.py b/emerge-timer.py index 5c07b6a..b37d9a0 100755 --- a/emerge-timer.py +++ b/emerge-timer.py @@ -464,7 +464,8 @@ Options: \t-p, --pretended Calculate compile time from piped 'emerge -p' output \t-h, --help \t Show this helpscreen \t-q, --quiet \t Be less verbose -\t--no-color \t Use colorless output""" +\t--no-color \t Use colorless output +\t--simulate \t Do a simulation run""" print usage @@ -476,7 +477,7 @@ if __name__ == "__main__": # Set the default mode as "package" mode = "package" input_package = None - + simulation = False for arg in sys.argv[1:]: @@ -496,10 +497,52 @@ if __name__ == "__main__": green_start = "" color_stop = "" + if arg == "--simulate": + simulation = True + if len(sys.argv) > 1: input_package = sys.argv[1] else: usage() - main(mode, input_package) + if simulation == True: + + print(red_start + "\n" + '*'*25 + "\n" + "THIS IS A SIMULATION RUN\n" + + '*'*25 + "\n") + + print("Beginning 'package' mode check") + + print("Checking for one emerge\n" + color_stop) + + LOGFILE = "simulate/fake_emerge.log" + PORTDIR = "simulate/" + + main("package", "first_fake_package") + + print(red_start + "\nChecking for three emerges\n" + color_stop) + + main("package", "second_fake_package") + + print(red_start + "\n'package' mode check complete\n") + + print(30*'*') + + print("\nBeginning 'current' mode check") + print("Current emerge with no emerge process\n" + color_stop) + + main("current", None) + + print(red_start + "\nCurrent emerge with emerge processes\n" + color_stop) + + PACKAGES.append(package("test-group/second_fake_package", "2.9-r2")) + PACKAGES.append(package("test-group/first_fake_package", "1.10.2-r1")) + + main("current", None) + + print(red_start + "\n" + '*'*20 + "\n" + "SIMULATION FINISHED\n" + + '*'*20 + color_stop) + + + else: + main(mode, input_package) diff --git a/simulate/fake_emerge.log b/simulate/fake_emerge.log new file mode 100644 index 0000000..a088c41 --- /dev/null +++ b/simulate/fake_emerge.log @@ -0,0 +1,42 @@ +1322234554: Started emerge on: Nov 25, 2011 17:22:33 +1322234554: *** emerge --complete-graph --oneshot --keep-going --verbose test-group/first_fake_package:0 +1322234582: >>> emerge (1 of 1) test-group/first_fake_package-1.10.2-r1 to / + +1322234864: >>> AUTOCLEAN: test-group/first_fake_package:0 +1322234864: === Unmerging... (test-group/first_fake_package-1.10.2-r1) +1322234866: >>> unmerge success: test-group/first_fake_package-1.10.2-r1 +1322234868: === (1 of 1) Post-Build Cleaning (test-group/first_fake_package-1.10.2-r1::/var/tmp/portage_tree/test-group/first_fake_package/cairo-1.10.2-r1.ebuild) +1322234868: ::: completed emerge (1 of 1) test-group/first_fake_package-1.10.2-r1 to / +1322234868: *** Finished. Cleaning up... +1322234871: *** exiting successfully. +1322234872: *** terminating. + +1322166394: >>> emerge (9 of 16) test-group/second_fake_package-4.5.3-r1 to / +1322166394: === (9 of 16) Cleaning (sys-devel/gcc-4.5.3-r1::/var/tmp/portage_tree/test-group/second_fake_package/gcc-4.5.3-r1.ebuild) +1322166398: === (9 of 16) Compiling/Merging (test-group/second_fake_package-4.5.3-r1::/var/tmp/portage_tree/test-group/second_fake_package/gcc-4.5.3-r1.ebuild) +1322173884: === (9 of 16) Merging (test-group/second_fake_package-4.5.3-r1::/var/tmp/portage_tree/test-group/second_fake_package/gcc-4.5.3-r1.ebuild) +1322173892: >>> AUTOCLEAN: test-group/second_fake_package:4.5 +1322173892: === Unmerging... (test-group/second_fake_package-4.5.3-r1) +1322173898: >>> unmerge success: test-group/second_fake_package-4.5.3-r1 +1322173918: === (9 of 16) Post-Build Cleaning (test-group/second_fake_package-4.5.3-r1::/var/tmp/portage_tree/test-group/second_fake_package/gcc-4.5.3-r1.ebuild) +1322173918: ::: completed emerge (9 of 16) test-group/second_fake_package-4.5.3-r1 to / + +1322173918: >>> emerge (10 of 16) test-group/second_fake_package-1.4.5 to / +1322173918: === (10 of 16) Cleaning (test-group/second_fake_package-1.4.5::/var/tmp/portage_tree/test-group/second_fake_package/apr-1.4.5.ebuild) +1322173918: === (10 of 16) Compiling/Merging (test-group/second_fake_package-1.4.5::/var/tmp/portage_tree/test-group/second_fake_package/apr-1.4.5.ebuild) +1322174089: === (10 of 16) Merging (test-group/second_fake_package-1.4.5::/var/tmp/portage_tree/test-group/second_fake_package/apr-1.4.5.ebuild) +1322174090: >>> AUTOCLEAN: test-group/second_fake_package:1 +1322174090: === Unmerging... (test-group/second_fake_package-1.4.5) +1322174092: >>> unmerge success: test-group/second_fake_package-1.4.5 +1322174094: === (10 of 16) Post-Build Cleaning (test-group/second_fake_package-1.4.5::/var/tmp/portage_tree/test-group/second_fake_package/apr-1.4.5.ebuild) +1322174094: ::: completed emerge (10 of 16) test-group/second_fake_package-1.4.5 to / + +1322174094: >>> emerge (11 of 16) test-group/second_fake_package-2.9-r2 to / +1322174094: === (11 of 16) Cleaning (test-group/second_fake_package-2.9-r2::/var/tmp/portage_tree/test-group/second_fake_package/llvm-2.9-r2.ebuild) +1322174094: === (11 of 16) Compiling/Merging (test-group/second_fake_package-2.9-r2::/var/tmp/portage_tree/test-group/second_fake_package/llvm-2.9-r2.ebuild) +1322177270: === (11 of 16) Merging (test-group/second_fake_package-2.9-r2::/var/tmp/portage_tree/test-group/second_fake_package/llvm-2.9-r2.ebuild) +1322177277: >>> AUTOCLEAN: test-group/second_fake_package:0 +1322177277: === Unmerging... (test-group/second_fake_package-2.8-r2) +1322177283: >>> unmerge success: test-group/second_fake_package-2.8-r2 +1322177286: === (11 of 16) Post-Build Cleaning (test-group/second_fake_package-2.9-r2::/var/tmp/portage_tree/test-group/second_fake_package/llvm-2.9-r2.ebuild) +1322177286: ::: completed emerge (11 of 16) test-group/second_fake_package-2.9-r2 to / -- 2.44.0