From ad11c54a79af1be366b4fea7d9c3ed2f5ef338d7 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Wed, 9 Jun 2021 15:55:11 -0600
Subject: [PATCH] Added a temporary fix in support of
 https://github.com/Unidata/netcdf-c/issues/2018.  Also, fixed a missing
 reference file when using cmake-based build systems.

---
 ncdap_test/CMakeLists.txt | 2 +-
 ncdap_test/testpathcvt.sh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ncdap_test/CMakeLists.txt b/ncdap_test/CMakeLists.txt
index 8e55b6c04..1489371e2 100644
--- a/ncdap_test/CMakeLists.txt
+++ b/ncdap_test/CMakeLists.txt
@@ -10,7 +10,7 @@ add_definitions(-D"TOPBINDIR=${CMAKE_CURRENT_BINARY_DIR}/../")
 remove_definitions(-DDLL_EXPORT)
 # add_definitions(-D"TOPSRCDIR=${CMAKE_CURRENT_SOURCE_DIR}")
 
-FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
+FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.sh ${CMAKE_CURRENT_SOURCE_DIR}/ref_pathcvt.txt)
 
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE)
 
diff --git a/ncdap_test/testpathcvt.sh b/ncdap_test/testpathcvt.sh
index cf1cd1abd..9c1e2aedc 100755
--- a/ncdap_test/testpathcvt.sh
+++ b/ncdap_test/testpathcvt.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
@@ -11,6 +11,7 @@ P="$2"
 echo -n "path: $T: |$P| => |" >>tmp_pathcvt.txt
 ${execdir}/pathcvt "$T" -e "$P" >>tmp_pathcvt.txt
 echo "|" >> tmp_pathcvt.txt
+
 }
 
 testcase() {
@@ -18,7 +19,7 @@ testcase() {
     testcase1 "-c" "$1"
     testcase1 "-m" "$1"
     testcase1 "-w" "$1"
-}    
+}
 
 rm -f tmp_pathcvt.txt