| commit | 25fc6d1f28e54c46689f12d3b93c2540ef45323a | [log] [tgz] |
|---|---|---|
| author | Eric Li <ericli@chromium.org> | Tue Sep 28 17:22:51 2010 -0700 |
| committer | Eric Li <ericli@chromium.org> | Tue Sep 28 17:22:51 2010 -0700 |
| tree | 6b787ffcd447723de9f23c93643652ce17c40323 | |
| parent | e9dfa20094df109d7a668526de92d8bdfe17f4e9 [diff] [blame] |
Merge remote branch 'cros/upstream' into tempbranch2 Merged to trunk@4816. BUG= TEST=we will build a new autotest server instance, and keep cautotest running and then later do a cname switch. Review URL: http://codereview.chromium.org/3511003 Change-Id: Iee5f52f45f28f84927d6c6f9a74edc370d40288a
diff --git a/client/tests/netperf2/netperf2.py b/client/tests/netperf2/netperf2.py index b82aa5c..179757a 100644 --- a/client/tests/netperf2/netperf2.py +++ b/client/tests/netperf2/netperf2.py
@@ -18,7 +18,7 @@ utils.system('patch -p0 < ../wait_before_data.patch') utils.configure() - utils.system('make') + utils.make() utils.system('sync') self.job.setup_dep(['sysstat'])