client/tests/libhugetlbfs/libhugetlbfs.py - Issue 3541002: Revert "Merge remote branch 'cros/upstream' into tempbranch2"

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/tests/libhugetlbfs/libhugetlbfs.py

Issue 3541002: Revert "Merge remote branch 'cros/upstream' into tempbranch2" (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git

Patch Set: Created 10 years, 3 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:

Index: client/tests/libhugetlbfs/libhugetlbfs.py

diff --git a/client/tests/libhugetlbfs/libhugetlbfs.py b/client/tests/libhugetlbfs/libhugetlbfs.py

index 373a5ba6a078fb57001b5be8195ade1d2c7f3548..2fe6b4596e53180030fef9c6ac6e1081d8a97bb3 100644

--- a/client/tests/libhugetlbfs/libhugetlbfs.py

+++ b/client/tests/libhugetlbfs/libhugetlbfs.py

@@ -44,9 +44,9 @@ class libhugetlbfs(test.test):

# make might fail if there are no proper headers for the 32 bit

# version, in that case try only for the 64 bit version

try:

- utils.make()

+ utils.system('make')

except:

- utils.make('OBJDIRS=obj64')

+ utils.system('make OBJDIRS=obj64')

def run_once(self):

@@ -54,9 +54,9 @@ class libhugetlbfs(test.test):

# make check might fail for 32 bit if the 32 bit compile earlier

# had failed. See if it passes for 64 bit in that case.

try:

- utils.make('check')

+ utils.system('make check')

except:

- utils.make('check OBJDIRS=obj64')

+ utils.system('make check OBJDIRS=obj64')

def cleanup(self):

« no previous file with comments | « client/tests/kvm/unittests.cfg.sample ('k') | client/tests/lmbench/lmbench.py » ('j') | no next file with comments »