notnczarr

DennisHeimbigner · Dec 6, 2023 · f6eb7bc · f6eb7bc
1 parent f4e851d
commit f6eb7bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/nczarr_test/run_notzarr.sh b/nczarr_test/run_notzarr.sh
@@ -14,7 +14,7 @@ cd $ISOPATH
 # Test ability to detect NCZarr/Zarr files
 
 URL="${NCZARR_S3_TEST_HOST}/${NCZARR_S3_TEST_BUCKET}"
-KEY="/${S3ISOPATH}"
+KEY="${S3ISOPATH}"
 
 sometestfailed=
 
@@ -30,7 +30,7 @@ cp ${srcdir}/ref_notzarr.tar.gz .
 gunzip ref_notzarr.tar.gz
 tar -xf ref_notzarr.tar
 if test "x$FEATURE_S3TESTS" = xyes ; then
-    ${execdir}/s3util -f notzarr.file/notzarr.txt -u "https://${URL}" -k "//${S3ISOPATH}/notzarr.s3/notzarr.txt" upload
+    ${execdir}/s3util -f notzarr.file/notzarr.txt -u "https://${URL}" -k "${S3ISOPATH}/notzarr.s3/notzarr.txt" upload
 fi
 
 echo "Test empty file"

diff --git a/nczarr_test/s3util.c b/nczarr_test/s3util.c
@@ -143,12 +143,14 @@ main(int argc, char** argv)
 	case 'k': {
 	    size_t len = strlen(optarg);
 	    dumpoptions.key = (char*)malloc(len+1+1);
+#if 0
 	    if(*optarg != '/') {
 	        fprintf(stderr,"warning: -k option does not start with '/': %s",optarg);
 		dumpoptions.key[0] = '/';
 		memcpy(dumpoptions.key+1,optarg,len);
 		len++;
 	    } else
+#endif
 		memcpy(dumpoptions.key,optarg,strlen(optarg));
 	    dumpoptions.key[len] = '\0';
 	    } break;