tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Macro benchmark now uses release binary.

Browse Source 
Reviewers: mislav.bradac

Reviewed By: mislav.bradac

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D606
This commit is contained in:
Matej Ferencevic 2017-07-29 23:17:17 +02:00
parent 515bc35911
commit e8dd64f6d3
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/apollo_build
View File

@ -5,13 +5,20 @@
cd .. cd ..
./init TIMEOUT=600 ./init
bash -c "doxygen Doxyfile >/dev/null 2>/dev/null" bash -c "doxygen Doxyfile >/dev/null 2>/dev/null"
cd build cd build
cmake -DTEST_COVERAGE=ON .. cmake -DTEST_COVERAGE=ON ..
TIMEOUT=1000 make -j$THREADS TIMEOUT=1000 make -j$THREADS
cd ..
mkdir build_release
cd build_release
cmake -DCMAKE_BUILD_TYPE=release ..
TIMEOUT=1000 make -j$THREADS memgraph_link_target
cd ../tools cd ../tools
./apollo_generate ./apollo_generate

15
tools/apollo_generate
View File

@ -173,14 +173,21 @@ RUNS.append(generate_run("quality_assurance", commands = commands,
BASE_DIR_NAME))) BASE_DIR_NAME)))
# macro benchmark tests # macro benchmark tests
BUILD_RELEASE_DIR = os.path.join(BASE_DIR, "build_release")
binary_release_name = run_cmd(["find", ".", "-maxdepth", "1", "-executable",
"-type", "f", "-name", "memgraph*"], BUILD_RELEASE_DIR).split("\n")[0][2:]
binary_release_path = os.path.join(BUILD_RELEASE_DIR, binary_release_name)
macro_bench_path = os.path.join(BASE_DIR, "tests", "macro_benchmark") macro_bench_path = os.path.join(BASE_DIR, "tests", "macro_benchmark")
stress_common = os.path.join(BASE_DIR, "tests", "stress", "common.py") stress_common = os.path.join(BASE_DIR, "tests", "stress", "common.py")
infile = create_archive("macro_benchmark", [binary_path, binary_link_path, infile = create_archive("macro_benchmark", [binary_release_path,
macro_bench_path, stress_common, config_path], cwd = WORKSPACE_DIR) macro_bench_path, stress_common, config_path],
cwd = WORKSPACE_DIR)
supervisor = "./{}/tests/macro_benchmark/harness/harness.py".format(BASE_DIR_NAME) supervisor = "./{}/tests/macro_benchmark/harness/harness.py".format(BASE_DIR_NAME)
args = "QuerySuite MemgraphRunner --groups aggregation" args = "QuerySuite MemgraphRunner --groups aggregation --RunnerBin " + binary_release_path
outfile_paths = "\./{}/tests/macro_benchmark/harness/\.harness_summary".format(
BASE_DIR_NAME)
RUNS.append(generate_run("macro_benchmark", supervisor = supervisor, RUNS.append(generate_run("macro_benchmark", supervisor = supervisor,
arguments = args, infile = infile)) arguments = args, infile = infile, outfile_paths = outfile_paths))
# store ARCHIVES and RUNS # store ARCHIVES and RUNS
store_metadata(OUTPUT_DIR, "archives", ARCHIVES) store_metadata(OUTPUT_DIR, "archives", ARCHIVES)