two small tweaks

duckdb · Nov 14, 2024 · f801a7a · f801a7a
1 parent ca1ea12
commit f801a7a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/makefiles/duckdb_extension_c.Makefile b/makefiles/duckdb_extension_c.Makefile
@@ -64,8 +64,8 @@ ifeq ($(DUCKDB_PLATFORM),windows_amd64_mingw)
 	MINGW=1
 endif
 ifeq ($(MINGW),1)
-	EXTRA_COPY_STEP_DEBUG=$(PYTHON_VENV_BIN) -c "import shutil;shutil.copyfile('cmake_build/debug/Debug/lib$(EXTENSION_LIB_FILENAME)', '$(OUTPUT_LIB_PATH_DEBUG)')"
-	EXTRA_COPY_STEP_RELEASE=$(PYTHON_VENV_BIN) -c "import shutil;shutil.copyfile('cmake_build/release/Release/lib$(EXTENSION_LIB_FILENAME)', '$(OUTPUT_LIB_PATH_RELEASE)')"
+	EXTRA_COPY_STEP_DEBUG=$(PYTHON_VENV_BIN) -c "from pathlib import Path;Path('./cmake_build/debug/Debug').mkdir(parents=True, exist_ok=True);import shutil;shutil.copyfile('cmake_build/debug/lib$(EXTENSION_LIB_FILENAME)', '$(OUTPUT_LIB_PATH_DEBUG)')"
+	EXTRA_COPY_STEP_RELEASE=$(PYTHON_VENV_BIN) -c "from pathlib import Path;Path('./cmake_build/release/Release').mkdir(parents=True, exist_ok=True);import shutil;shutil.copyfile('cmake_build/release/lib$(EXTENSION_LIB_FILENAME)', '$(OUTPUT_LIB_PATH_RELEASE)')"
 endif
 
 #############################################

diff --git a/makefiles/duckdb_extension_c_api.Makefile b/makefiles/duckdb_extension_c_api.Makefile
@@ -124,6 +124,14 @@ ifeq ($(DUCKDB_PLATFORM),linux_amd64)
 	SKIP_TESTS=1
 endif
 
+# The mingw/rtools can not be tested using the python test runner unfortunately
+ifeq ($(DUCKDB_PLATFORM),windows_amd64_rtools)
+	SKIP_TESTS=1
+endif
+ifeq ($(DUCKDB_PLATFORM),windows_amd64_mingw)
+	SKIP_TESTS=1
+endif
+
 ifeq ($(SKIP_TESTS),1)
 	TEST_RELEASE_TARGET=tests_skipped
 	TEST_DEBUG_TARGET=tests_skipped