Added return values to the scripts.
Fixed build_benchmarks to return the correct values back to perflab.
PRESUBMIT=passed
R=raymes,bjanakiraman
CC=c-compiler-reviews
DELTA=60 (24 added, 2 deleted, 34 changed)
OCL=50177-p2
RCL=50246-p2
RDATE=2011/03/21 11:35:53
P4 change: 42619261
diff --git a/v14/build_benchmarks.py b/v14/build_benchmarks.py
index 2d78cec..a37ed1d 100755
--- a/v14/build_benchmarks.py
+++ b/v14/build_benchmarks.py
@@ -152,9 +152,12 @@
options.chromeos_root = os.path.expanduser(options.chromeos_root)
options.workdir = os.path.expanduser(options.workdir)
- found_err = 0
retval = 0
- version_dir = utils.GetRoot(argv[0])[0]
+ if options.third_party:
+ third_party = options.third_party
+ else:
+ third_party = "%s/../../../third_party" % os.path.dirname(__file__)
+ third_party = os.path.realpath(third_party)
for arg in args:
# CPU benchmarks
if re.match('chromeos/cpu', arg):
@@ -162,8 +165,8 @@
benchname = comps[2]
tec_options = []
- if options.third_party:
- tec_options.append("--third_party=%s" % options.third_party)
+ if third_party:
+ tec_options.append("--third_party=%s" % third_party)
if options.clean:
retval = build_chromeos.ExecuteCommandInChroot(options.chromeos_root,
CPU_BUILDCMD_CLEAN % benchname,
@@ -177,13 +180,14 @@
tec_options=tec_options)
utils.AssertError(retval == 0, "Build of benchmark %s failed." % arg)
if retval == 0 and (options.build or options.only_copy):
- benchdir = ('%s/third_party/android_bench/v2_0/CLOSED_SOURCE/%s' %
- (version_dir, benchname))
+ benchdir = ('%s/android_bench/v2_0/CLOSED_SOURCE/%s' %
+ (third_party, benchname))
linkdir = '%s/perflab-bin/%s' % (options.workdir, arg)
- CreateBinaryCopy(benchdir, linkdir)
- CreateRunsh(linkdir, arg)
- if not found_err:
- found_err = retval
+
+ retval = CreateBinaryCopy(benchdir, linkdir)
+ if retval != 0: return retval
+ retval = CreateRunsh(linkdir, arg)
+ if retval != 0: return retval
elif re.match('chromeos/startup', arg):
if options.build:
# Clean for chromeos/browser and chromeos/startup is a Nop since builds are always from scratch.
@@ -200,10 +204,10 @@
if retval == 0 and (options.build or options.only_copy):
benchdir = '%s/src/build/images/%s/latest' % (options.chromeos_root, options.board)
linkdir = '%s/perflab-bin/%s' % (options.workdir, arg)
- CreateBinaryCopy(benchdir, linkdir)
+ retval = CreateBinaryCopy(benchdir, linkdir)
+ if retval != 0: return retval
CreateRunsh(linkdir, arg)
- if not found_err:
- found_err = retval
+ if retval != 0: return retval
elif re.match('chromeos/browser', arg):
if options.build:
# For now, re-build os. TBD: Change to call build_browser
@@ -219,12 +223,13 @@
if retval == 0 and (options.build or options.only_copy):
benchdir = '%s/src/build/images/%s/latest' % (options.chromeos_root, options.board)
linkdir = '%s/perflab-bin/%s' % (options.workdir, arg)
- CreateBinaryCopy(benchdir,linkdir)
- CreateRunsh(linkdir, arg)
- if not found_err:
- found_err = retval
+ retval = CreateBinaryCopy(benchdir,linkdir)
+ if retval != 0: return retval
+ retval = CreateRunsh(linkdir, arg)
+ if retval != 0: return retval
- return found_err
+ return 0
if __name__ == "__main__":
- Main(sys.argv)
+ retval = Main(sys.argv)
+ sys.exit(retval)
diff --git a/v14/build_chrome_browser.py b/v14/build_chrome_browser.py
index df6a4a1..bf44535 100755
--- a/v14/build_chrome_browser.py
+++ b/v14/build_chrome_browser.py
@@ -123,4 +123,5 @@
return ret
if __name__ == "__main__":
- Main(sys.argv)
+ retval = Main(sys.argv)
+ sys.exit(retval)
diff --git a/v14/build_chromeos.py b/v14/build_chromeos.py
index 1443bdf..756c60c 100755
--- a/v14/build_chromeos.py
+++ b/v14/build_chromeos.py
@@ -196,4 +196,5 @@
return ret
if __name__ == "__main__":
- Main(sys.argv)
+ retval = Main(sys.argv)
+ sys.exit(retval)
diff --git a/v14/build_tc.py b/v14/build_tc.py
index 3bb7f3f..1a27810 100755
--- a/v14/build_tc.py
+++ b/v14/build_tc.py
@@ -251,5 +251,6 @@
return retval
if __name__ == "__main__":
- Main(sys.argv)
+ retval = Main(sys.argv)
+ sys.exit(retval)
diff --git a/v14/compare_benchmarks.py b/v14/compare_benchmarks.py
index 45ffa8d..e583aa7 100755
--- a/v14/compare_benchmarks.py
+++ b/v14/compare_benchmarks.py
@@ -162,7 +162,9 @@
else:
print "%15.15s%15.15s%15.15s%14.2f%%" % ('Geomean', '', '', prod)
print
+ return 0
if __name__ == "__main__":
- Main(sys.argv)
+ retval = Main(sys.argv)
+ sys.exit(retval)
diff --git a/v14/image_chromeos.py b/v14/image_chromeos.py
index 522c897..68cd2e9 100755
--- a/v14/image_chromeos.py
+++ b/v14/image_chromeos.py
@@ -155,4 +155,5 @@
if __name__ == "__main__":
- ImageChromeOS(sys.argv)
+ retval = ImageChromeOS(sys.argv)
+ sys.exit(retval)
diff --git a/v14/run_benchmarks.py b/v14/run_benchmarks.py
index 5928a1a..a88adcd 100755
--- a/v14/run_benchmarks.py
+++ b/v14/run_benchmarks.py
@@ -233,4 +233,5 @@
return found_err
if __name__ == "__main__":
- Main(sys.argv)
+ retval = Main(sys.argv)
+ sys.exit(retval)
diff --git a/v14/run_dejagnu.py b/v14/run_dejagnu.py
index 9099733..cee0eb1 100755
--- a/v14/run_dejagnu.py
+++ b/v14/run_dejagnu.py
@@ -131,6 +131,7 @@
options.toolchain_root))
utils.AssertWarning(ret == 0, "Failed to copy results to final destination.")
+ return ret
def GetRemoteAccessCommonCommands(remote):
@@ -164,4 +165,5 @@
if __name__ == "__main__":
- Main(sys.argv)
+ retval = Main(sys.argv)
+ sys.exit(retval)
diff --git a/v14/run_tests.py b/v14/run_tests.py
index 77e8c8f..be91c38 100755
--- a/v14/run_tests.py
+++ b/v14/run_tests.py
@@ -58,4 +58,5 @@
return retval
if __name__ == "__main__":
- Main(sys.argv)
+ retval = Main(sys.argv)
+ sys.exit(retval)
diff --git a/v14/setup_chromeos.py b/v14/setup_chromeos.py
index 559b5d3..2347a5b 100755
--- a/v14/setup_chromeos.py
+++ b/v14/setup_chromeos.py
@@ -168,7 +168,9 @@
cmd_executer.RunCommands(commands)
print "Done"
+ return 0
if __name__ == "__main__":
- Main(sys.argv)
+ retval = Main(sys.argv)
+ sys.exit(retval)
diff --git a/v14/summarize_results.py b/v14/summarize_results.py
index 853eaca..3e561f3 100755
--- a/v14/summarize_results.py
+++ b/v14/summarize_results.py
@@ -118,7 +118,9 @@
output = open(RESULTS_FILE, "a")
output.write(summary.strip() + "\n")
output.close()
+ return 0
if __name__ == "__main__":
- Main(sys.argv)
+ retval = Main(sys.argv)
+ sys.exit(retval)
diff --git a/v14/tc_enter_chroot.py b/v14/tc_enter_chroot.py
index 4e7478a..d776af5 100755
--- a/v14/tc_enter_chroot.py
+++ b/v14/tc_enter_chroot.py
@@ -255,5 +255,6 @@
if __name__ == "__main__":
- Main(sys.argv)
+ retval = Main(sys.argv)
+ sys.exit(retval)
diff --git a/v14/update_git_repo.py b/v14/update_git_repo.py
index 4caf42a..6a5a3a3 100755
--- a/v14/update_git_repo.py
+++ b/v14/update_git_repo.py
@@ -252,9 +252,11 @@
raise
status = DeleteP4Client(client_name, temp_dir)
utils.AssertTrue(status == 0, "Could not delete p4 client")
+ return status
if __name__ == "__main__":
- Main()
+ retval = Main()
+ sys.exit(retval)