From 4ef33dc2b4b688f306184526f042008acc13a0c1 Mon Sep 17 00:00:00 2001
From: Shreyas Goenka <shreyas.goenka@databricks.com>
Date: Wed, 5 Mar 2025 11:09:26 +0100
Subject: [PATCH] Revert "split windows test"

This reverts commit 2c773683bc3133d11fd0cf04c2ca5de0431db4a8.
---
 acceptance/bundle/exec/basic/test.toml               | 3 ---
 acceptance/bundle/exec/cmd-not-found/test.toml       | 3 ---
 acceptance/bundle/exec/cwd/{unix => }/a/b/c/.gitkeep | 0
 acceptance/bundle/exec/cwd/{unix => }/databricks.yml | 0
 acceptance/bundle/exec/cwd/{unix => }/output.txt     | 0
 acceptance/bundle/exec/cwd/{unix => }/script         | 0
 acceptance/bundle/exec/cwd/unix/test.toml            | 4 ----
 acceptance/bundle/exec/cwd/windows/a/b/c/.gitkeep    | 0
 acceptance/bundle/exec/cwd/windows/databricks.yml    | 2 --
 acceptance/bundle/exec/cwd/windows/output.txt        | 8 --------
 acceptance/bundle/exec/cwd/windows/script            | 6 ------
 acceptance/bundle/exec/cwd/windows/test.toml         | 4 ----
 12 files changed, 30 deletions(-)
 delete mode 100644 acceptance/bundle/exec/basic/test.toml
 delete mode 100644 acceptance/bundle/exec/cmd-not-found/test.toml
 rename acceptance/bundle/exec/cwd/{unix => }/a/b/c/.gitkeep (100%)
 rename acceptance/bundle/exec/cwd/{unix => }/databricks.yml (100%)
 rename acceptance/bundle/exec/cwd/{unix => }/output.txt (100%)
 rename acceptance/bundle/exec/cwd/{unix => }/script (100%)
 delete mode 100644 acceptance/bundle/exec/cwd/unix/test.toml
 delete mode 100644 acceptance/bundle/exec/cwd/windows/a/b/c/.gitkeep
 delete mode 100644 acceptance/bundle/exec/cwd/windows/databricks.yml
 delete mode 100644 acceptance/bundle/exec/cwd/windows/output.txt
 delete mode 100644 acceptance/bundle/exec/cwd/windows/script
 delete mode 100644 acceptance/bundle/exec/cwd/windows/test.toml

diff --git a/acceptance/bundle/exec/basic/test.toml b/acceptance/bundle/exec/basic/test.toml
deleted file mode 100644
index ca7d069ae..000000000
--- a/acceptance/bundle/exec/basic/test.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[Repls]]
-Old = "%PATH%"
-New = "$PATH"
diff --git a/acceptance/bundle/exec/cmd-not-found/test.toml b/acceptance/bundle/exec/cmd-not-found/test.toml
deleted file mode 100644
index ca7d069ae..000000000
--- a/acceptance/bundle/exec/cmd-not-found/test.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[Repls]]
-Old = "%PATH%"
-New = "$PATH"
diff --git a/acceptance/bundle/exec/cwd/unix/a/b/c/.gitkeep b/acceptance/bundle/exec/cwd/a/b/c/.gitkeep
similarity index 100%
rename from acceptance/bundle/exec/cwd/unix/a/b/c/.gitkeep
rename to acceptance/bundle/exec/cwd/a/b/c/.gitkeep
diff --git a/acceptance/bundle/exec/cwd/unix/databricks.yml b/acceptance/bundle/exec/cwd/databricks.yml
similarity index 100%
rename from acceptance/bundle/exec/cwd/unix/databricks.yml
rename to acceptance/bundle/exec/cwd/databricks.yml
diff --git a/acceptance/bundle/exec/cwd/unix/output.txt b/acceptance/bundle/exec/cwd/output.txt
similarity index 100%
rename from acceptance/bundle/exec/cwd/unix/output.txt
rename to acceptance/bundle/exec/cwd/output.txt
diff --git a/acceptance/bundle/exec/cwd/unix/script b/acceptance/bundle/exec/cwd/script
similarity index 100%
rename from acceptance/bundle/exec/cwd/unix/script
rename to acceptance/bundle/exec/cwd/script
diff --git a/acceptance/bundle/exec/cwd/unix/test.toml b/acceptance/bundle/exec/cwd/unix/test.toml
deleted file mode 100644
index 7f30bdcde..000000000
--- a/acceptance/bundle/exec/cwd/unix/test.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-[GOOS]
-windows = false
-linux = true
-darwin = true
diff --git a/acceptance/bundle/exec/cwd/windows/a/b/c/.gitkeep b/acceptance/bundle/exec/cwd/windows/a/b/c/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/acceptance/bundle/exec/cwd/windows/databricks.yml b/acceptance/bundle/exec/cwd/windows/databricks.yml
deleted file mode 100644
index 432311dab..000000000
--- a/acceptance/bundle/exec/cwd/windows/databricks.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bundle:
-  name: foobar
diff --git a/acceptance/bundle/exec/cwd/windows/output.txt b/acceptance/bundle/exec/cwd/windows/output.txt
deleted file mode 100644
index e6496afab..000000000
--- a/acceptance/bundle/exec/cwd/windows/output.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
->>> cd a/b/c
-
->>> pwd
-[TMPDIR]/a/b/c
-
->>> [CLI] bundle exec -- pwd
-[TMPDIR]
diff --git a/acceptance/bundle/exec/cwd/windows/script b/acceptance/bundle/exec/cwd/windows/script
deleted file mode 100644
index 3461f6afc..000000000
--- a/acceptance/bundle/exec/cwd/windows/script
+++ /dev/null
@@ -1,6 +0,0 @@
-trace cd a/b/c
-
-trace pwd
-
-# Scripts that bundle exec executes should run from the bundle root.
-trace $CLI bundle exec -- dir
diff --git a/acceptance/bundle/exec/cwd/windows/test.toml b/acceptance/bundle/exec/cwd/windows/test.toml
deleted file mode 100644
index 22f2c79f0..000000000
--- a/acceptance/bundle/exec/cwd/windows/test.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-[GOOS]
-windows = true
-linux = false
-darwin = false