diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 103f4bcd0..1ff7178e9 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -115,7 +115,7 @@ jobs: fi mkdir benchmark && cd benchmark - ../source/tests/benchmarks/benchmark.sh \ + ../source/benchmarks/cli/benchmark.sh \ ${SUITE_FLAG} ${DEBUG_FLAG} \ --admin \ --baseline-cli "git" --cli "${GIT2_CLI}" --name libgit2 \ diff --git a/tests/benchmarks/README.md b/benchmarks/cli/README.md similarity index 100% rename from tests/benchmarks/README.md rename to benchmarks/cli/README.md diff --git a/tests/benchmarks/_script/flamegraph/README.md b/benchmarks/cli/_script/flamegraph/README.md similarity index 100% rename from tests/benchmarks/_script/flamegraph/README.md rename to benchmarks/cli/_script/flamegraph/README.md diff --git a/tests/benchmarks/_script/flamegraph/aix-perf.pl b/benchmarks/cli/_script/flamegraph/aix-perf.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/aix-perf.pl rename to benchmarks/cli/_script/flamegraph/aix-perf.pl diff --git a/tests/benchmarks/_script/flamegraph/difffolded.pl b/benchmarks/cli/_script/flamegraph/difffolded.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/difffolded.pl rename to benchmarks/cli/_script/flamegraph/difffolded.pl diff --git a/tests/benchmarks/_script/flamegraph/example-dtrace-stacks.txt b/benchmarks/cli/_script/flamegraph/example-dtrace-stacks.txt similarity index 100% rename from tests/benchmarks/_script/flamegraph/example-dtrace-stacks.txt rename to benchmarks/cli/_script/flamegraph/example-dtrace-stacks.txt diff --git a/tests/benchmarks/_script/flamegraph/example-dtrace.svg b/benchmarks/cli/_script/flamegraph/example-dtrace.svg similarity index 100% rename from tests/benchmarks/_script/flamegraph/example-dtrace.svg rename to benchmarks/cli/_script/flamegraph/example-dtrace.svg diff --git a/tests/benchmarks/_script/flamegraph/example-perf-stacks.txt.gz b/benchmarks/cli/_script/flamegraph/example-perf-stacks.txt.gz similarity index 100% rename from tests/benchmarks/_script/flamegraph/example-perf-stacks.txt.gz rename to benchmarks/cli/_script/flamegraph/example-perf-stacks.txt.gz diff --git a/tests/benchmarks/_script/flamegraph/example-perf.svg b/benchmarks/cli/_script/flamegraph/example-perf.svg similarity index 100% rename from tests/benchmarks/_script/flamegraph/example-perf.svg rename to benchmarks/cli/_script/flamegraph/example-perf.svg diff --git a/tests/benchmarks/_script/flamegraph/files.pl b/benchmarks/cli/_script/flamegraph/files.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/files.pl rename to benchmarks/cli/_script/flamegraph/files.pl diff --git a/tests/benchmarks/_script/flamegraph/flamegraph.pl b/benchmarks/cli/_script/flamegraph/flamegraph.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/flamegraph.pl rename to benchmarks/cli/_script/flamegraph/flamegraph.pl diff --git a/tests/benchmarks/_script/flamegraph/jmaps b/benchmarks/cli/_script/flamegraph/jmaps similarity index 100% rename from tests/benchmarks/_script/flamegraph/jmaps rename to benchmarks/cli/_script/flamegraph/jmaps diff --git a/tests/benchmarks/_script/flamegraph/pkgsplit-perf.pl b/benchmarks/cli/_script/flamegraph/pkgsplit-perf.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/pkgsplit-perf.pl rename to benchmarks/cli/_script/flamegraph/pkgsplit-perf.pl diff --git a/tests/benchmarks/_script/flamegraph/range-perf.pl b/benchmarks/cli/_script/flamegraph/range-perf.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/range-perf.pl rename to benchmarks/cli/_script/flamegraph/range-perf.pl diff --git a/tests/benchmarks/_script/flamegraph/record-test.sh b/benchmarks/cli/_script/flamegraph/record-test.sh similarity index 100% rename from tests/benchmarks/_script/flamegraph/record-test.sh rename to benchmarks/cli/_script/flamegraph/record-test.sh diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-aix.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-aix.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-aix.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-aix.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-bpftrace.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-bpftrace.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-bpftrace.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-bpftrace.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-chrome-tracing.py b/benchmarks/cli/_script/flamegraph/stackcollapse-chrome-tracing.py similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-chrome-tracing.py rename to benchmarks/cli/_script/flamegraph/stackcollapse-chrome-tracing.py diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-elfutils.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-elfutils.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-elfutils.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-elfutils.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-faulthandler.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-faulthandler.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-faulthandler.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-faulthandler.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-gdb.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-gdb.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-gdb.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-gdb.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-go.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-go.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-go.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-go.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-ibmjava.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-ibmjava.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-ibmjava.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-ibmjava.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-instruments.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-instruments.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-instruments.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-instruments.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-java-exceptions.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-java-exceptions.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-java-exceptions.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-java-exceptions.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-jstack.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-jstack.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-jstack.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-jstack.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-ljp.awk b/benchmarks/cli/_script/flamegraph/stackcollapse-ljp.awk similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-ljp.awk rename to benchmarks/cli/_script/flamegraph/stackcollapse-ljp.awk diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-perf-sched.awk b/benchmarks/cli/_script/flamegraph/stackcollapse-perf-sched.awk similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-perf-sched.awk rename to benchmarks/cli/_script/flamegraph/stackcollapse-perf-sched.awk diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-perf.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-perf.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-perf.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-perf.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-pmc.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-pmc.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-pmc.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-pmc.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-recursive.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-recursive.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-recursive.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-recursive.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-sample.awk b/benchmarks/cli/_script/flamegraph/stackcollapse-sample.awk similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-sample.awk rename to benchmarks/cli/_script/flamegraph/stackcollapse-sample.awk diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-stap.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-stap.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-stap.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-stap.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-vsprof.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-vsprof.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-vsprof.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-vsprof.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-vtune-mc.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-vtune-mc.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-vtune-mc.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-vtune-mc.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-vtune.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-vtune.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-vtune.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-vtune.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-wcp.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-wcp.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-wcp.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse-wcp.pl diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-xdebug.php b/benchmarks/cli/_script/flamegraph/stackcollapse-xdebug.php similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse-xdebug.php rename to benchmarks/cli/_script/flamegraph/stackcollapse-xdebug.php diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse.pl b/benchmarks/cli/_script/flamegraph/stackcollapse.pl similarity index 100% rename from tests/benchmarks/_script/flamegraph/stackcollapse.pl rename to benchmarks/cli/_script/flamegraph/stackcollapse.pl diff --git a/tests/benchmarks/_script/flamegraph/test.sh b/benchmarks/cli/_script/flamegraph/test.sh similarity index 100% rename from tests/benchmarks/_script/flamegraph/test.sh rename to benchmarks/cli/_script/flamegraph/test.sh diff --git a/tests/benchmarks/benchmark.sh b/benchmarks/cli/benchmark.sh similarity index 100% rename from tests/benchmarks/benchmark.sh rename to benchmarks/cli/benchmark.sh diff --git a/tests/benchmarks/benchmark_helpers.sh b/benchmarks/cli/benchmark_helpers.sh similarity index 99% rename from tests/benchmarks/benchmark_helpers.sh rename to benchmarks/cli/benchmark_helpers.sh index cf0cd5121..f78aabc09 100644 --- a/tests/benchmarks/benchmark_helpers.sh +++ b/benchmarks/cli/benchmark_helpers.sh @@ -105,7 +105,7 @@ fullpath() { } resources_dir() { - cd "$(dirname "$0")/../resources" && pwd + cd "$(dirname "$0")/../../tests/resources" && pwd } temp_dir() { diff --git a/tests/benchmarks/blame__git b/benchmarks/cli/blame__git similarity index 100% rename from tests/benchmarks/blame__git rename to benchmarks/cli/blame__git diff --git a/tests/benchmarks/blame__linux b/benchmarks/cli/blame__linux similarity index 100% rename from tests/benchmarks/blame__linux rename to benchmarks/cli/blame__linux diff --git a/tests/benchmarks/blame__simple b/benchmarks/cli/blame__simple similarity index 100% rename from tests/benchmarks/blame__simple rename to benchmarks/cli/blame__simple diff --git a/tests/benchmarks/hash-object__text_100kb b/benchmarks/cli/hash-object__text_100kb similarity index 100% rename from tests/benchmarks/hash-object__text_100kb rename to benchmarks/cli/hash-object__text_100kb diff --git a/tests/benchmarks/hash-object__text_10mb b/benchmarks/cli/hash-object__text_10mb similarity index 100% rename from tests/benchmarks/hash-object__text_10mb rename to benchmarks/cli/hash-object__text_10mb diff --git a/tests/benchmarks/hash-object__text_1kb b/benchmarks/cli/hash-object__text_1kb similarity index 100% rename from tests/benchmarks/hash-object__text_1kb rename to benchmarks/cli/hash-object__text_1kb diff --git a/tests/benchmarks/hash-object__text_nocache_100kb b/benchmarks/cli/hash-object__text_nocache_100kb similarity index 100% rename from tests/benchmarks/hash-object__text_nocache_100kb rename to benchmarks/cli/hash-object__text_nocache_100kb diff --git a/tests/benchmarks/hash-object__text_nocache_10mb b/benchmarks/cli/hash-object__text_nocache_10mb similarity index 100% rename from tests/benchmarks/hash-object__text_nocache_10mb rename to benchmarks/cli/hash-object__text_nocache_10mb diff --git a/tests/benchmarks/hash-object__text_nocache_1kb b/benchmarks/cli/hash-object__text_nocache_1kb similarity index 100% rename from tests/benchmarks/hash-object__text_nocache_1kb rename to benchmarks/cli/hash-object__text_nocache_1kb diff --git a/tests/benchmarks/hash-object__write_text_100kb b/benchmarks/cli/hash-object__write_text_100kb similarity index 100% rename from tests/benchmarks/hash-object__write_text_100kb rename to benchmarks/cli/hash-object__write_text_100kb diff --git a/tests/benchmarks/hash-object__write_text_10mb b/benchmarks/cli/hash-object__write_text_10mb similarity index 100% rename from tests/benchmarks/hash-object__write_text_10mb rename to benchmarks/cli/hash-object__write_text_10mb diff --git a/tests/benchmarks/hash-object__write_text_1kb b/benchmarks/cli/hash-object__write_text_1kb similarity index 100% rename from tests/benchmarks/hash-object__write_text_1kb rename to benchmarks/cli/hash-object__write_text_1kb diff --git a/tests/benchmarks/hash-object__write_text_nocache_100kb b/benchmarks/cli/hash-object__write_text_nocache_100kb similarity index 100% rename from tests/benchmarks/hash-object__write_text_nocache_100kb rename to benchmarks/cli/hash-object__write_text_nocache_100kb diff --git a/tests/benchmarks/hash-object__write_text_nocache_10mb b/benchmarks/cli/hash-object__write_text_nocache_10mb similarity index 100% rename from tests/benchmarks/hash-object__write_text_nocache_10mb rename to benchmarks/cli/hash-object__write_text_nocache_10mb diff --git a/tests/benchmarks/hash-object__write_text_nocache_1kb b/benchmarks/cli/hash-object__write_text_nocache_1kb similarity index 100% rename from tests/benchmarks/hash-object__write_text_nocache_1kb rename to benchmarks/cli/hash-object__write_text_nocache_1kb diff --git a/tests/benchmarks/indexpack__250mb b/benchmarks/cli/indexpack__250mb similarity index 100% rename from tests/benchmarks/indexpack__250mb rename to benchmarks/cli/indexpack__250mb diff --git a/tests/README.md b/tests/README.md index 460e045e3..78e625242 100644 --- a/tests/README.md +++ b/tests/README.md @@ -2,10 +2,6 @@ These are the unit and integration tests for the libgit2 projects. -* `benchmarks` - These are benchmark tests that excercise the CLI. -* `clar` - This is [clar](https://github.com/clar-test/clar) the common test framework. * `headertest` This is a simple project that ensures that our public headers are compatible with extremely strict compilation options.