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

Move harness stuff to parent directory

Browse Source 
Reviewers: buda

Reviewed By: buda

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D799
This commit is contained in:
Mislav Bradac 2017-09-15 13:23:05 +02:00
parent d640ca3f1a
commit 7e5dddecae
96 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/macro_benchmark/harness/.gitignore → tests/macro_benchmark/.gitignore vendored
View File

0
tests/macro_benchmark/harness/clients.py → tests/macro_benchmark/clients.py
View File

0
tests/macro_benchmark/harness/clients/bolt_client.hpp → tests/macro_benchmark/clients/bolt_client.hpp
View File

0
tests/macro_benchmark/harness/clients/common.hpp → tests/macro_benchmark/clients/common.hpp
View File

0
tests/macro_benchmark/harness/clients/long_running_client.cpp → tests/macro_benchmark/clients/long_running_client.cpp
View File

0
tests/macro_benchmark/harness/clients/postgres_client.hpp → tests/macro_benchmark/clients/postgres_client.hpp
View File

0
tests/macro_benchmark/harness/clients/query_client.cpp → tests/macro_benchmark/clients/query_client.cpp
View File

8
tests/macro_benchmark/harness/common.py → tests/macro_benchmark/common.py
View File

@ -8,13 +8,13 @@ DIR_PATH = os.path.dirname(os.path.realpath(__file__))
def get_absolute_path(path, base=""): def get_absolute_path(path, base=""):
if base == "build": if base == "build":
extra = "../../../build" extra = "../../build"
elif base == "build_release": elif base == "build_release":
extra = "../../../build_release" extra = "../../build_release"
elif base == "libs": elif base == "libs":
extra = "../../../libs" extra = "../../libs"
elif base == "config": elif base == "config":
extra = "../../../config" extra = "../../config"
else: else:
extra = "" extra = ""
return os.path.normpath(os.path.join(DIR_PATH, extra, path)) return os.path.normpath(os.path.join(DIR_PATH, extra, path))

0
tests/macro_benchmark/harness/config/neo4j.conf → tests/macro_benchmark/config/neo4j.conf
View File

0
tests/macro_benchmark/harness/config/neo4j_long_running.conf → tests/macro_benchmark/config/neo4j_long_running.conf
View File

0
tests/macro_benchmark/harness/databases.py → tests/macro_benchmark/databases.py
View File

0
tests/macro_benchmark/harness/groups/1000_create/config.json → tests/macro_benchmark/groups/1000_create/config.json
View File

0
tests/macro_benchmark/harness/groups/1000_create/edge.iterteardown.cypher → tests/macro_benchmark/groups/1000_create/edge.iterteardown.cypher
View File

0
tests/macro_benchmark/harness/groups/1000_create/edge.run.py → tests/macro_benchmark/groups/1000_create/edge.run.py
View File

0
tests/macro_benchmark/harness/groups/1000_create/edge.setup.cypher → tests/macro_benchmark/groups/1000_create/edge.setup.cypher
View File

0
tests/macro_benchmark/harness/groups/1000_create/pattern.iterteardown.cypher → tests/macro_benchmark/groups/1000_create/pattern.iterteardown.cypher
View File

0
tests/macro_benchmark/harness/groups/1000_create/pattern.run.py → tests/macro_benchmark/groups/1000_create/pattern.run.py
View File

0
tests/macro_benchmark/harness/groups/1000_create/teardown.cypher → tests/macro_benchmark/groups/1000_create/teardown.cypher
View File

0
tests/macro_benchmark/harness/groups/1000_create/vertex.iterteardown.cypher → tests/macro_benchmark/groups/1000_create/vertex.iterteardown.cypher
View File

0
tests/macro_benchmark/harness/groups/1000_create/vertex.run.py → tests/macro_benchmark/groups/1000_create/vertex.run.py
View File

0
tests/macro_benchmark/harness/groups/1000_create/vertex_big.iterteardown.cypher → tests/macro_benchmark/groups/1000_create/vertex_big.iterteardown.cypher
View File

0
tests/macro_benchmark/harness/groups/1000_create/vertex_big.run.py → tests/macro_benchmark/groups/1000_create/vertex_big.run.py
View File

0
tests/macro_benchmark/harness/groups/aggregation/config.json → tests/macro_benchmark/groups/aggregation/config.json
View File

0
tests/macro_benchmark/harness/groups/aggregation/count.run.cypher → tests/macro_benchmark/groups/aggregation/count.run.cypher
View File

0
tests/macro_benchmark/harness/groups/aggregation/min_max_avg.run.cypher → tests/macro_benchmark/groups/aggregation/min_max_avg.run.cypher
View File

0
tests/macro_benchmark/harness/groups/aggregation/setup.py → tests/macro_benchmark/groups/aggregation/setup.py
View File

0
tests/macro_benchmark/harness/groups/aggregation_parallel/config.json → tests/macro_benchmark/groups/aggregation_parallel/config.json
View File

0
tests/macro_benchmark/harness/groups/aggregation_parallel/count.run.py → tests/macro_benchmark/groups/aggregation_parallel/count.run.py
View File

0
tests/macro_benchmark/harness/groups/aggregation_parallel/min_max_avg.run.py → tests/macro_benchmark/groups/aggregation_parallel/min_max_avg.run.py
View File

0
tests/macro_benchmark/harness/groups/aggregation_parallel/setup.py → tests/macro_benchmark/groups/aggregation_parallel/setup.py
View File

0
tests/macro_benchmark/harness/groups/create_parallel/config.json → tests/macro_benchmark/groups/create_parallel/config.json
View File

0
tests/macro_benchmark/harness/groups/create_parallel/iterteardown.cypher → tests/macro_benchmark/groups/create_parallel/iterteardown.cypher
View File

0
tests/macro_benchmark/harness/groups/create_parallel/vertex.run.py → tests/macro_benchmark/groups/create_parallel/vertex.run.py
View File

0
tests/macro_benchmark/harness/groups/delete/common.py → tests/macro_benchmark/groups/delete/common.py
View File

0
tests/macro_benchmark/harness/groups/delete/config.json → tests/macro_benchmark/groups/delete/config.json
View File

0
tests/macro_benchmark/harness/groups/delete/edge.itersetup.py → tests/macro_benchmark/groups/delete/edge.itersetup.py
View File

0
tests/macro_benchmark/harness/groups/delete/edge.run.cypher → tests/macro_benchmark/groups/delete/edge.run.cypher
View File

0
tests/macro_benchmark/harness/groups/delete/edge.setup.py → tests/macro_benchmark/groups/delete/edge.setup.py
View File

0
tests/macro_benchmark/harness/groups/delete/teardown.cypher → tests/macro_benchmark/groups/delete/teardown.cypher
View File

0
tests/macro_benchmark/harness/groups/delete/vertex.itersetup.py → tests/macro_benchmark/groups/delete/vertex.itersetup.py
View File

0
tests/macro_benchmark/harness/groups/delete/vertex.run.cypher → tests/macro_benchmark/groups/delete/vertex.run.cypher
View File

0
tests/macro_benchmark/harness/groups/delete/vertex_detach.itersetup.py → tests/macro_benchmark/groups/delete/vertex_detach.itersetup.py
View File

0
tests/macro_benchmark/harness/groups/delete/vertex_detach.run.cypher → tests/macro_benchmark/groups/delete/vertex_detach.run.cypher
View File

0
tests/macro_benchmark/harness/groups/dense_expand/config.json → tests/macro_benchmark/groups/dense_expand/config.json
View File

0
tests/macro_benchmark/harness/groups/dense_expand/expand.run.cypher → tests/macro_benchmark/groups/dense_expand/expand.run.cypher
View File

0
tests/macro_benchmark/harness/groups/dense_expand/expand_into_existing.run.cypher → tests/macro_benchmark/groups/dense_expand/expand_into_existing.run.cypher
View File

0
tests/macro_benchmark/harness/groups/dense_expand/setup.cypher → tests/macro_benchmark/groups/dense_expand/setup.cypher
View File

0
tests/macro_benchmark/harness/groups/dense_expand/teardown.cypher → tests/macro_benchmark/groups/dense_expand/teardown.cypher
View File

0
tests/macro_benchmark/harness/groups/expression/common.py → tests/macro_benchmark/groups/expression/common.py
View File

0
tests/macro_benchmark/harness/groups/expression/config.json → tests/macro_benchmark/groups/expression/config.json
View File

0
tests/macro_benchmark/harness/groups/expression/expression.run.py → tests/macro_benchmark/groups/expression/expression.run.py
View File

0
tests/macro_benchmark/harness/groups/match/config.json → tests/macro_benchmark/groups/match/config.json
View File

0
tests/macro_benchmark/harness/groups/match/pattern_cycle.run.cypher → tests/macro_benchmark/groups/match/pattern_cycle.run.cypher
View File

0
tests/macro_benchmark/harness/groups/match/pattern_long.run.cypher → tests/macro_benchmark/groups/match/pattern_long.run.cypher
View File

0
tests/macro_benchmark/harness/groups/match/pattern_short.run.cypher → tests/macro_benchmark/groups/match/pattern_short.run.cypher
View File

0
tests/macro_benchmark/harness/groups/match/setup.py → tests/macro_benchmark/groups/match/setup.py
View File

0
tests/macro_benchmark/harness/groups/match/teardown.cypher → tests/macro_benchmark/groups/match/teardown.cypher
View File

0
tests/macro_benchmark/harness/groups/match/vertex_on_index.run.py → tests/macro_benchmark/groups/match/vertex_on_index.run.py
View File

0
tests/macro_benchmark/harness/groups/match/vertex_on_label.run.py → tests/macro_benchmark/groups/match/vertex_on_label.run.py
View File

0
tests/macro_benchmark/harness/groups/match/vertex_on_label_property.run.py → tests/macro_benchmark/groups/match/vertex_on_label_property.run.py
View File

0
tests/macro_benchmark/harness/groups/match/vertex_on_property.run.py → tests/macro_benchmark/groups/match/vertex_on_property.run.py
View File

0
tests/macro_benchmark/harness/groups/pokec/.gitignore → tests/macro_benchmark/groups/pokec/.gitignore vendored
View File

0
tests/macro_benchmark/harness/groups/pokec/pokec_small.config.json → tests/macro_benchmark/groups/pokec/pokec_small.config.json
View File

0
tests/macro_benchmark/harness/groups/pokec/pokec_small.run.json → tests/macro_benchmark/groups/pokec/pokec_small.run.json
View File

0
tests/macro_benchmark/harness/groups/return/combo.run.py → tests/macro_benchmark/groups/return/combo.run.py
View File

0
tests/macro_benchmark/harness/groups/return/config.json → tests/macro_benchmark/groups/return/config.json
View File

0
tests/macro_benchmark/harness/groups/return/distinct.run.cypher → tests/macro_benchmark/groups/return/distinct.run.cypher
View File

0
tests/macro_benchmark/harness/groups/return/limit.run.cypher → tests/macro_benchmark/groups/return/limit.run.cypher
View File

0
tests/macro_benchmark/harness/groups/return/order_by.run.cypher → tests/macro_benchmark/groups/return/order_by.run.cypher
View File

0
tests/macro_benchmark/harness/groups/return/setup.py → tests/macro_benchmark/groups/return/setup.py
View File

0
tests/macro_benchmark/harness/groups/return/skip.run.py → tests/macro_benchmark/groups/return/skip.run.py
View File

0
tests/macro_benchmark/harness/groups/unwind_create/config.json → tests/macro_benchmark/groups/unwind_create/config.json
View File

0
tests/macro_benchmark/harness/groups/unwind_create/edge.iterteardown.cypher → tests/macro_benchmark/groups/unwind_create/edge.iterteardown.cypher
View File

0
tests/macro_benchmark/harness/groups/unwind_create/edge.run.cypher → tests/macro_benchmark/groups/unwind_create/edge.run.cypher
View File

0
tests/macro_benchmark/harness/groups/unwind_create/edge.setup.cypher → tests/macro_benchmark/groups/unwind_create/edge.setup.cypher
View File

0
tests/macro_benchmark/harness/groups/unwind_create/pattern.iterteardown.cypher → tests/macro_benchmark/groups/unwind_create/pattern.iterteardown.cypher
View File

0
tests/macro_benchmark/harness/groups/unwind_create/pattern.run.cypher → tests/macro_benchmark/groups/unwind_create/pattern.run.cypher
View File

0
tests/macro_benchmark/harness/groups/unwind_create/teardown.cypher → tests/macro_benchmark/groups/unwind_create/teardown.cypher
View File

0
tests/macro_benchmark/harness/groups/unwind_create/vertex.iterteardown.cypher → tests/macro_benchmark/groups/unwind_create/vertex.iterteardown.cypher
View File

0
tests/macro_benchmark/harness/groups/unwind_create/vertex.run.cypher → tests/macro_benchmark/groups/unwind_create/vertex.run.cypher
View File

0
tests/macro_benchmark/harness/groups/unwind_create/vertex_big.iterteardown.cypher → tests/macro_benchmark/groups/unwind_create/vertex_big.iterteardown.cypher
View File

0
tests/macro_benchmark/harness/groups/unwind_create/vertex_big.run.cypher → tests/macro_benchmark/groups/unwind_create/vertex_big.run.cypher
View File

0
tests/macro_benchmark/harness/groups/update/remove_label.itersetup.cypher → tests/macro_benchmark/groups/update/remove_label.itersetup.cypher
View File

0
tests/macro_benchmark/harness/groups/update/remove_label.run.cypher → tests/macro_benchmark/groups/update/remove_label.run.cypher
View File

0
tests/macro_benchmark/harness/groups/update/remove_property.itersetup.cypher → tests/macro_benchmark/groups/update/remove_property.itersetup.cypher
View File

0
tests/macro_benchmark/harness/groups/update/remove_property.run.cypher → tests/macro_benchmark/groups/update/remove_property.run.cypher
View File

0
tests/macro_benchmark/harness/groups/update/set_label.iterteardown.cypher → tests/macro_benchmark/groups/update/set_label.iterteardown.cypher
View File

0
tests/macro_benchmark/harness/groups/update/set_label.run.cypher → tests/macro_benchmark/groups/update/set_label.run.cypher
View File

0
tests/macro_benchmark/harness/groups/update/set_property.iterteardown.cypher → tests/macro_benchmark/groups/update/set_property.iterteardown.cypher
View File

0
tests/macro_benchmark/harness/groups/update/set_property.run.cypher → tests/macro_benchmark/groups/update/set_property.run.cypher
View File

0
tests/macro_benchmark/harness/groups/update/setup.py → tests/macro_benchmark/groups/update/setup.py
View File

0
tests/macro_benchmark/harness/harness.py → tests/macro_benchmark/harness.py
View File

0
tests/macro_benchmark/harness/jail_faker.py → tests/macro_benchmark/jail_faker.py
View File

0
tests/macro_benchmark/harness/long_running_suite.py → tests/macro_benchmark/long_running_suite.py
View File

0
tests/macro_benchmark/harness/query_suite.py → tests/macro_benchmark/query_suite.py
View File

6
tools/apollo/generate
View File

@ -202,8 +202,8 @@ postgresql_lib_dir = os.path.join(LIBS_DIR, "postgresql", "lib")
infile = create_archive("macro_benchmark", [binary_release_path, infile = create_archive("macro_benchmark", [binary_release_path,
binary_release_link_path, macro_bench_path, config_path, binary_release_link_path, macro_bench_path, config_path,
harness_client_binaries, postgresql_lib_dir], cwd = WORKSPACE_DIR) harness_client_binaries, postgresql_lib_dir], cwd = WORKSPACE_DIR)
supervisor = "./memgraph/tests/macro_benchmark/harness/harness.py" supervisor = "./memgraph/tests/macro_benchmark/harness.py"
outfile_paths = "\./memgraph/tests/macro_benchmark/harness/\.harness_summary" outfile_paths = "\./memgraph/tests/macro_benchmark/\.harness_summary"
RUNS.append(generate_run("macro_benchmark", supervisor = supervisor, RUNS.append(generate_run("macro_benchmark", supervisor = supervisor,
arguments = MACRO_BENCHMARK_ARGS, infile = infile, arguments = MACRO_BENCHMARK_ARGS, infile = infile,
outfile_paths = outfile_paths)) outfile_paths = outfile_paths))
@ -237,7 +237,7 @@ if mode == "diff":
infile = create_archive("macro_benchmark_summary", [script_path], infile = create_archive("macro_benchmark_summary", [script_path],
cwd = WORKSPACE_DIR) cwd = WORKSPACE_DIR)
cmd = "./memgraph/tools/apollo/macro_benchmark_summary " \ cmd = "./memgraph/tools/apollo/macro_benchmark_summary " \
"macro_benchmark/memgraph/tests/macro_benchmark/harness/.harness_summary " \ "macro_benchmark/memgraph/tests/macro_benchmark/.harness_summary " \
"macro_benchmark_parent/parent/tests/macro_benchmark/harness/.harness_summary " \ "macro_benchmark_parent/parent/tests/macro_benchmark/harness/.harness_summary " \
".harness_summary" ".harness_summary"
outfile_paths = "\./.harness_summary" outfile_paths = "\./.harness_summary"