Fix Linux tests

Author: jimmysoda

.gitlab-ci.yml

@@ -62,6 +62,9 @@ build-x64-windows-debug:
 .job_template: &test-windows
   tags:
     - windows
+  before_script:
+    - set GDAL_DATA=%VCPKG_ROOT%\installed\x64-windows\share\gdal
+    - set PROJ_LIB=%VCPKG_ROOT%\installed\x64-windows\share\proj4
   stage: test
   cache:
     policy: pull
@@ -70,11 +73,8 @@ test-x64-windows-release:
   <<: *test-windows
   dependencies:
     - build-x64-windows-release
-  before_script:
-    - cd %VCPKG_ROOT%/installed/x64-windows/bin
   script:
-    - set GDAL_DATA=%VCPKG_ROOT%\installed\x64-windows\share\gdal
-    - set PROJ_LIB=%VCPKG_ROOT%\installed\x64-windows\share\proj4
+    - cd %VCPKG_ROOT%/installed/x64-windows/bin
     - copy proj_4_9.dll proj.dll
     - "%CI_PROJECT_DIR%/build/build-x64-windows-release/bin/test_pdalc"
   cache:
@@ -86,11 +86,8 @@ test-x64-windows-debug:
   <<: *test-windows
   dependencies:
     - build-x64-windows-debug
-  before_script:
-    - cd %VCPKG_ROOT%/installed/x64-windows/debug/bin
   script:
-    - set GDAL_DATA=%VCPKG_ROOT%\installed\x64-windows\share\gdal
-    - set PROJ_LIB=%VCPKG_ROOT%\installed\x64-windows\share\proj4
+    - cd %VCPKG_ROOT%/installed/x64-windows/debug/bin
     - copy proj_4_9_d.dll proj.dll
     - "%CI_PROJECT_DIR%/build/build-x64-windows-debug/bin/test_pdalcd"
   cache:

source/pdal/pdalc_config.cpp

@@ -7,15 +7,14 @@
 #include <pdal/pdal_config.hpp>
 #include <pdal/util/Utils.hpp>
 
+#include <cstdlib>
 #include <cstring>
 #include <string>
 
 namespace pdal
 {
 	namespace capi
 	{
-		std::ofstream pdalcConfigLog("pdalc_config.log");
-
 		size_t PDALGetGdalDataPath(char *path, size_t size)
 		{
 			size_t length = 0;
@@ -25,9 +24,22 @@ namespace pdal
 				path[0] = '\0';
 				path[size-1] = '\0';
 
-				std::string s = std::getenv("GDAL_DATA");
-				std::strncpy(path, s.c_str(), size - 1);
-				length = std::min(s.length(), size - 1);
+				char *env = nullptr;
+
+				try
+				{
+					env = std::getenv("GDAL_DATA");
+				}
+				catch (const std::exception &e)
+				{
+					env = nullptr;
+				}
+
+				if (env)
+				{
+					std::strncpy(path, env, size - 1);
+					length = std::min(std::strlen(env), size - 1);
+				}
 			}
 
 			return length;
@@ -42,9 +54,22 @@ namespace pdal
 				path[0] = '\0';
 				path[size-1] = '\0';
 
-				std::string s = std::getenv("PROJ_LIB");
-				std::strncpy(path, s.c_str(), size - 1);
-				length = std::min(s.length(), size - 1);
+				char *env = nullptr;
+
+				try
+				{
+					env = std::getenv("PROJ_LIB");
+				}
+				catch (const std::exception &e)
+				{
+					env = nullptr;
+				}
+
+				if (env)
+				{
+					std::strncpy(path, env, size - 1);
+					length = std::min(std::strlen(env), size - 1);
+				}
 			}
 
 			return length;

tests/pdal/test_pdalc_config.c

@@ -16,13 +16,28 @@ SUITE(test_pdalc_config);
 
 TEST testPDALGetSetGdalDataPath(void)
 {
+	size_t size = PDALGetGdalDataPath(NULL, 1024);
+	ASSERT_EQ(0, size);
+
 	char *original = getenv("GDAL_DATA");
 	char path[1024];
-	size_t size = PDALGetGdalDataPath(path, 1024);
-	ASSERT_STR_EQ(original, path);
-	ASSERT_EQ(strlen(path), size);
 
-	char *expected = "An arbitrary string set as the GDAL data path";
+	size = PDALGetGdalDataPath(path, 0);
+	ASSERT_EQ(0, size);
+
+	size = PDALGetGdalDataPath(path, 1024);
+
+	if (original)
+	{
+		ASSERT_STR_EQ(original, path);
+		ASSERT_EQ(strlen(path), size);
+	}
+	else
+	{
+		ASSERT_EQ(0, path[0]);
+	}
+
+	const char *expected = "An arbitrary string set as the GDAL data path";
 	PDALSetGdalDataPath(expected);
 	size = PDALGetGdalDataPath(path, 1024);
 	ASSERT_STR_EQ(expected, path);
@@ -35,13 +50,28 @@ TEST testPDALGetSetGdalDataPath(void)
 
 TEST testPDALGetSetProj4DataPath(void)
 {
+	size_t size = PDALGetProj4DataPath(NULL, 1024);
+	ASSERT_EQ(0, size);
+
 	char *original = getenv("PROJ_LIB");
 	char path[1024];
-	size_t size = PDALGetProj4DataPath(path, 1024);
-	ASSERT_STR_EQ(original, path);
-	ASSERT_EQ(size, strlen(path));
 
-	char *expected = "An arbitrary string set as the proj4 data path";
+	size = PDALGetProj4DataPath(path, 0);
+	ASSERT_EQ(0, size);
+
+	size = PDALGetProj4DataPath(path, 1024);
+
+	if (original)
+	{
+		ASSERT_STR_EQ(original, path);
+		ASSERT_EQ(size, strlen(path));
+	}
+	else
+	{
+		ASSERT_EQ(0, path[0]);
+	}
+
+	const char *expected = "An arbitrary string set as the proj4 data path";
 	PDALSetProj4DataPath(expected);
 	size = PDALGetProj4DataPath(path, 1024);
 	ASSERT_STR_EQ(expected, path);