summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2015-11-12 21:00:53 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-11-12 21:00:53 +0000
commitdf6a677fac4e74723de43c1ad8540c9bdd0d6ad4 (patch)
treec85fe3032995b5d8f47f44c8fbf643579fbf5808
parent442e95221fb7fa4e98dab788b0382140843e32a1 (diff)
parentf49eec3a65f8a2a08b603cf8d0b142b101277d6a (diff)
downloadextras-df6a677fac4e74723de43c1ad8540c9bdd0d6ad4.tar.gz
Merge "Fix a size specification bug for the bandwidth test."
-rw-r--r--tests/memtest/bandwidth.cpp4
-rw-r--r--tests/memtest/bandwidth.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/memtest/bandwidth.cpp b/tests/memtest/bandwidth.cpp
index 5ad74687..5ff6756b 100644
--- a/tests/memtest/bandwidth.cpp
+++ b/tests/memtest/bandwidth.cpp
@@ -136,7 +136,7 @@ BandwidthBenchmark *createBandwidthBenchmarkObject(arg_t values) {
return NULL;
}
- if (!bench->setSize(values["size"].int_value)) {
+ if (!bench->setSize(size)) {
printf("Failed to allocate buffers for benchmark.\n");
return NULL;
}
@@ -394,7 +394,7 @@ bool run_bandwidth_benchmark(int argc, char** argv, const char *name,
if (!(*it)->canRun()) {
continue;
}
- if (!(*it)->setSize(values["num_warm_loops"].int_value)) {
+ if (!(*it)->setSize(values["size"].int_value)) {
printf("Failed creating buffer for bandwidth test.\n");
return false;
}
diff --git a/tests/memtest/bandwidth.h b/tests/memtest/bandwidth.h
index e1dc81b6..b43349ce 100644
--- a/tests/memtest/bandwidth.h
+++ b/tests/memtest/bandwidth.h
@@ -439,7 +439,7 @@ public:
_buffer = NULL;
}
- if (_size == 0) {
+ if (size == 0) {
_size = DEFAULT_SINGLE_BUFFER_SIZE;
} else {
_size = size;