client/site_tests/platform_StackProtector/platform_StackProtector.py - Issue 6090004: Move Autotest to /usr/local/autotest and fix hard-coded autodir paths in client tests.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: client/site_tests/platform_StackProtector/platform_StackProtector.py

Issue 6090004: Move Autotest to /usr/local/autotest and fix hard-coded autodir paths in client tests. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master

Patch Set: Revert to hard-coded path for logging_UserCrash Created 9 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « client/site_tests/logging_UserCrash/logging_UserCrash.py ('k') | client/site_tests/power_LoadTest/external_extensions.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: client/site_tests/platform_StackProtector/platform_StackProtector.py

diff --git a/client/site_tests/platform_StackProtector/platform_StackProtector.py b/client/site_tests/platform_StackProtector/platform_StackProtector.py

index 640ac4dd5f846b398256df6d5b39d6d70c62a238..e34fd7cacf12fb7fc4d370b5b4899757f21beabc 100644

--- a/client/site_tests/platform_StackProtector/platform_StackProtector.py

+++ b/client/site_tests/platform_StackProtector/platform_StackProtector.py

@@ -41,11 +41,10 @@ class platform_StackProtector(test.test):

"""

libc_glob = "/lib/libc-[0-9]*"

os.chdir(self.srcdir)

- cmd = ("find '%s' -wholename /proc -prune -o "

+ cmd = ("find '%s' -wholename %s -prune -o "

+ " -wholename /proc -prune -o "

" -wholename /dev -prune -o "

" -wholename /sys -prune -o "

- " -wholename /home/autotest -prune -o "

- " -wholename /usr/local/autotest -prune -o "

" -wholename /mnt/stateful_partition -prune -o "

# A couple of files known to be a false positive:

" -wholename '/home/chronos/Safe Browsing Bloom*' -prune -o "

@@ -56,7 +55,7 @@ class platform_StackProtector(test.test):

"sh -c 'binutils/objdump -CR {} 2>&1 | "

"egrep -q \"(stack_chk|Invalid|not recognized)\" || echo {}' ';'"

)

- badfiles = utils.system_output(cmd % (rootdir, libc_glob))

+ badfiles = utils.system_output(cmd % (rootdir, self.autodir, libc_glob))

# special case check for libc, needs different objdump flags

cmd = "binutils/objdump -D %s | egrep -q stack_chk || echo %s"