From 0e13fc52beb433a1abc0812cd07190de205af898 Mon Sep 17 00:00:00 2001
From: Sabine <Sabine_SIL@web.de>
Date: Mon, 16 Jan 2023 15:43:34 +0100
Subject: [PATCH] chore(developer): use environment var KEYMAN_ROOT in path for
 tests; remove try-catch from json-validation.cpp

---
 developer/src/kmcmplib/src/json-validation.cpp               | 5 -----
 developer/src/kmcmplib/tests/get_test_source.bat             | 2 +-
 developer/src/kmcmplib/tests/get_test_source_exclude.bat     | 3 ---
 .../src/kmcmplib/tests/get_test_source_exclude_some_kmn.bat  | 4 ++--
 4 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 developer/src/kmcmplib/tests/get_test_source_exclude.bat

diff --git a/developer/src/kmcmplib/src/json-validation.cpp b/developer/src/kmcmplib/src/json-validation.cpp
index bf5b312b78..8e443853ed 100644
--- a/developer/src/kmcmplib/src/json-validation.cpp
+++ b/developer/src/kmcmplib/src/json-validation.cpp
@@ -16,12 +16,7 @@ static void loader(const json_uri &uri, json &schema)
   if (!lf.good())
     throw std::invalid_argument("could not open " + uri.url() + " tried with " + uri.path());
 
-  try {
     lf >> schema;
-  }
-  catch (std::exception &e) {
-    throw e;
-  }
 }
 
 extern "C" BOOL __declspec(dllexport) ValidateJsonFile(PWSTR schemaStream, PWSTR jsonStream , ValidateJsonMessageProc MessageProc) {
diff --git a/developer/src/kmcmplib/tests/get_test_source.bat b/developer/src/kmcmplib/tests/get_test_source.bat
index 908cbce2cc..d366cb4fb7 100644
--- a/developer/src/kmcmplib/tests/get_test_source.bat
+++ b/developer/src/kmcmplib/tests/get_test_source.bat
@@ -1,2 +1,2 @@
 @echo off
-dir /s/b ..\..\..\..\keyboards\release\*.kmn
+dir /s/b %KEYMAN_ROOT%\..\keyboards\release\*.kmn
\ No newline at end of file
diff --git a/developer/src/kmcmplib/tests/get_test_source_exclude.bat b/developer/src/kmcmplib/tests/get_test_source_exclude.bat
deleted file mode 100644
index 38bb134c98..0000000000
--- a/developer/src/kmcmplib/tests/get_test_source_exclude.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-dir  /s/b ..\..\..\..\keyboards\release\*.kmn | more | findstr /v /i "\ahom_star.kmn" | findstr /v /i  "\batak.kmn"  
-pause
\ No newline at end of file
diff --git a/developer/src/kmcmplib/tests/get_test_source_exclude_some_kmn.bat b/developer/src/kmcmplib/tests/get_test_source_exclude_some_kmn.bat
index 63a07a6069..ba0982cbcd 100644
--- a/developer/src/kmcmplib/tests/get_test_source_exclude_some_kmn.bat
+++ b/developer/src/kmcmplib/tests/get_test_source_exclude_some_kmn.bat
@@ -17,5 +17,5 @@ rem		- vietnamese_vni
 
 rem added CERR_XXXX-Tests to test if right ErrorMessage is sent
 
-dir  /s/b ..\..\..\..\common\test\keyboards\invalid\*.kmn
-dir  /s/b ..\..\..\..\..\keyboards\release\*.kmn | more |   findstr /v /i  "viet*" |  findstr /v /i  "eKwTamil99UniUpdt"
+dir  /s/b %KEYMAN_ROOT%\common\test\keyboards\invalid\*.kmn
+dir  /s/b %KEYMAN_ROOT%\..\keyboards\release\*.kmn | more |   findstr /v /i  "viet*" |  findstr /v /i  "eKwTamil99UniUpdt"