From ca2616e573450946edd0e07c36b27e6b4f59bbd3 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <timwoj@gmail.com>
Date: Tue, 25 Apr 2023 15:32:25 -0700
Subject: [PATCH] Modify Windows test cmd file to actually run tests

---
 ci/windows/test.cmd  | 12 ++++++++----
 zeek-path-dev.bat.in |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ci/windows/test.cmd b/ci/windows/test.cmd
index aae40887d9..5b5ff7329f 100644
--- a/ci/windows/test.cmd
+++ b/ci/windows/test.cmd
@@ -1,7 +1,11 @@
 :: See build.cmd for documentation on this call.
 call "c:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
 
-:: We currently don't have any tests to run on Windows, so this is just commented out.
-:: We'll expand on this later.
-:: cd build
-:: ctest -C release || exit \b 1
+cd build
+
+:: This sets up ZEEKPATH and ZEEK_PLUGIN_PATH
+call zeek-path-dev.bat
+
+:: Only run the unit tests for now. Btest is supported on Windows but a ton
+:: of tests are still failing so it's not worth trying to run it.
+src\zeek --test
diff --git a/zeek-path-dev.bat.in b/zeek-path-dev.bat.in
index 342b770492..8602245e2a 100644
--- a/zeek-path-dev.bat.in
+++ b/zeek-path-dev.bat.in
@@ -4,5 +4,5 @@
 :: The ZEEKPATH line here should be kept in sync with the zeek-path-dev.in file.
 ::
 
-set ZEEKPATH=.;${cmake_source_dir}/scripts;${cmake_source_dir}/scripts/policy;${cmake_source_dir}/scripts/site;${cmake_binary_dir}/scripts;${cmake_binary_dir}/scripts/builtin-plugins
-set ZEEK_PLUGIN_PATH=${cmake_binary_dir}/src}
+@set ZEEKPATH=.;${cmake_source_dir}/scripts;${cmake_source_dir}/scripts/policy;${cmake_source_dir}/scripts/site;${cmake_binary_dir}/scripts;${cmake_binary_dir}/scripts/builtin-plugins
+@set ZEEK_PLUGIN_PATH=${cmake_binary_dir}/src}