From f7ce441a3f37683ea2d739a149235b45e195673d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 5 Mar 2021 19:47:39 -0800
Subject: [PATCH 1/2] ensure test/scripts does not exist in dfhack repo

---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4635db7a0..d0a57ea18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -491,6 +491,9 @@ endif()
 
 option(BUILD_TESTS "Include tests (currently just installs Lua tests into the scripts folder)" OFF)
 if(BUILD_TESTS)
+    if(EXISTS "${dfhack_SOURCE_DIR}/test/scripts")
+        message(SEND_ERROR "test/scripts must not exist in the dfhack repo since it would conflict with the tests installed from the scripts repo.")
+    endif()
     install(DIRECTORY ${dfhack_SOURCE_DIR}/test
         DESTINATION ${DFHACK_DATA_DESTINATION}/scripts)
 endif()

From 3e2b5dd27c65966c7195b28cdba1203bcfdf654d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 7 Mar 2021 08:23:20 -0800
Subject: [PATCH 2/2] update changelog

---
 docs/changelog.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index cece75f72..03dc97902 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -36,6 +36,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Documentation
 - Added more client library implementations to the `remote interface docs <remote-client-libs>`
 
+## Internals
+- Ensure no tests are checked in to the dfhack repo in the test/scripts directory; that directory is reserved for tests in the scripts repo
+
 # 0.47.05-r1
 
 ## Fixes