WIP make benchmark work

samansmink · Jul 24, 2024 · 3b49dc7 · 3b49dc7
1 parent 51715fa
commit 3b49dc7
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -11,6 +11,11 @@ test_release: export DAT_PATH=./build/release/rust/src/delta_kernel/acceptance/t
 test_debug: export DELTA_KERNEL_TESTS_PATH=./build/debug/rust/src/delta_kernel/kernel/tests/data
 test_debug: export DAT_PATH=./build/debug/rust/src/delta_kernel/acceptance/tests/dat
 
+# Set this flag during building to enable the benchmark runner
+ifeq (${BUILD_BENCHMARK}, 1)
+	TOOLCHAIN_FLAGS:=${TOOLCHAIN_FLAGS} -DBUILD_BENCHMARKS=1
+endif
+
 # Include the Makefile from extension-ci-tools
 include extension-ci-tools/makefiles/duckdb_extension.Makefile
 

diff --git a/benchmark/benchmark.Makefile b/benchmark/benchmark.Makefile
@@ -1,11 +1,6 @@
 .PHONY: bench-output-dir clean_benchmark plot
 
-# Set this flag during building to enable the benchmark runner
-ifeq (${BUILD_BENCHMARK}, 1)
-	TOOLCHAIN_FLAGS:=${TOOLCHAIN_FLAGS} -DBUILD_BENCHMARKS=1
-endif
-
-ifeq ("${BENCHMARK_PATTERN}", "")
+ifeq ("${BENCHMARK_PATTERN}a", "a")
 	BENCHMARK_PATTERN:=.*
 endif
 

diff --git a/duckdb b/duckdb
diff --git a/extension-ci-tools b/extension-ci-tools
diff --git a/extension_config.cmake b/extension_config.cmake
@@ -9,19 +9,19 @@ duckdb_extension_load(delta
 # Build the httpfs extension to test with s3/http
 duckdb_extension_load(httpfs)
 
-# Build the azure extension to test with azure
-duckdb_extension_load(azure
-        LOAD_TESTS
-        GIT_URL https://github.com/duckdb/duckdb_azure
-        GIT_TAG d92b3b87ff06e6694883b1a6dbf684eeefedd609
-)
-
-# Build the aws extension to test with credential providers
-duckdb_extension_load(aws
-        LOAD_TESTS
-        GIT_URL https://github.com/duckdb/duckdb_aws
-        GIT_TAG 42c78d3f99e1a188a2b178ea59e3c17907af4fb2
-)
+## Build the azure extension to test with azure
+#duckdb_extension_load(azure
+#        LOAD_TESTS
+#        GIT_URL https://github.com/duckdb/duckdb_azure
+#        GIT_TAG d92b3b87ff06e6694883b1a6dbf684eeefedd609
+#)
+#
+## Build the aws extension to test with credential providers
+#duckdb_extension_load(aws
+#        LOAD_TESTS
+#        GIT_URL https://github.com/duckdb/duckdb_aws
+#        GIT_TAG 42c78d3f99e1a188a2b178ea59e3c17907af4fb2
+#)
 
 # Build the tpch and tpcds extension for testing/benchmarking
 duckdb_extension_load(tpch)
+0 −37		.github/workflows/TestCITools.yml
+163 −163		.github/workflows/_extension_distribution.yml
+1 −9		makefiles/duckdb_extension.Makefile