summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-04-11 21:57:14 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-04-11 21:57:14 (GMT)
commit2821b8bd768138db6b5f917a5b7325f878f8f7d0 (patch)
treeae5d2e592dbfc4e73bf730a9d9129137b92b8855
parentccb4e9ed9a5e0af27db9f1504a628e35d7f4cf92 (diff)
parent8a9e4b94c3938f4c42ad9399737afc6478ded160 (diff)
downloadhdf5-2821b8bd768138db6b5f917a5b7325f878f8f7d0.zip
hdf5-2821b8bd768138db6b5f917a5b7325f878f8f7d0.tar.gz
hdf5-2821b8bd768138db6b5f917a5b7325f878f8f7d0.tar.bz2
Merge pull request #412 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '8a9e4b94c3938f4c42ad9399737afc6478ded160': Fix URL name DAILYTEST-250 change test props to reduce timeout
-rw-r--r--java/src/jni/exceptionImp.c2
-rw-r--r--java/src/jni/h5Constants.c2
-rw-r--r--java/src/jni/h5Imp.c2
-rw-r--r--java/src/jni/h5aImp.c2
-rw-r--r--java/src/jni/h5dImp.c2
-rw-r--r--java/src/jni/h5eImp.c2
-rw-r--r--java/src/jni/h5fImp.c2
-rw-r--r--java/src/jni/h5gImp.c2
-rw-r--r--java/src/jni/h5iImp.c2
-rw-r--r--java/src/jni/h5jni.h2
-rw-r--r--java/src/jni/h5lImp.c2
-rw-r--r--java/src/jni/h5oImp.c2
-rw-r--r--java/src/jni/h5pImp.c2
-rw-r--r--java/src/jni/h5plImp.c2
-rw-r--r--java/src/jni/h5rImp.c2
-rw-r--r--java/src/jni/h5sImp.c2
-rw-r--r--java/src/jni/h5tImp.c2
-rw-r--r--java/src/jni/h5util.c2
-rw-r--r--java/src/jni/h5util.h2
-rw-r--r--java/src/jni/h5zImp.c2
-rw-r--r--java/src/jni/nativeData.c2
-rw-r--r--test/CMakeTests.cmake4
22 files changed, 23 insertions, 23 deletions
diff --git a/java/src/jni/exceptionImp.c b/java/src/jni/exceptionImp.c
index 28eec21..d0e7790 100644
--- a/java/src/jni/exceptionImp.c
+++ b/java/src/jni/exceptionImp.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5Constants.c b/java/src/jni/h5Constants.c
index c6aa16c..ddca853 100644
--- a/java/src/jni/h5Constants.c
+++ b/java/src/jni/h5Constants.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5Imp.c b/java/src/jni/h5Imp.c
index 7a24b6f..e548363 100644
--- a/java/src/jni/h5Imp.c
+++ b/java/src/jni/h5Imp.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5aImp.c b/java/src/jni/h5aImp.c
index 5af8aae..5445904 100644
--- a/java/src/jni/h5aImp.c
+++ b/java/src/jni/h5aImp.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5dImp.c b/java/src/jni/h5dImp.c
index ed1db41..9765dc8 100644
--- a/java/src/jni/h5dImp.c
+++ b/java/src/jni/h5dImp.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5eImp.c b/java/src/jni/h5eImp.c
index 6e05515..05a7848 100644
--- a/java/src/jni/h5eImp.c
+++ b/java/src/jni/h5eImp.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5fImp.c b/java/src/jni/h5fImp.c
index 058ba26..4f0e569 100644
--- a/java/src/jni/h5fImp.c
+++ b/java/src/jni/h5fImp.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5gImp.c b/java/src/jni/h5gImp.c
index c40ed64..d724475 100644
--- a/java/src/jni/h5gImp.c
+++ b/java/src/jni/h5gImp.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5iImp.c b/java/src/jni/h5iImp.c
index 71e1b71..9c946df 100644
--- a/java/src/jni/h5iImp.c
+++ b/java/src/jni/h5iImp.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5jni.h b/java/src/jni/h5jni.h
index 9414d31..cef3bd0 100644
--- a/java/src/jni/h5jni.h
+++ b/java/src/jni/h5jni.h
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5lImp.c b/java/src/jni/h5lImp.c
index 473b1c7..f7a9df1 100644
--- a/java/src/jni/h5lImp.c
+++ b/java/src/jni/h5lImp.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5oImp.c b/java/src/jni/h5oImp.c
index 24f6988..a33d1d7 100644
--- a/java/src/jni/h5oImp.c
+++ b/java/src/jni/h5oImp.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5pImp.c b/java/src/jni/h5pImp.c
index f39f0e6..c9bd4aa 100644
--- a/java/src/jni/h5pImp.c
+++ b/java/src/jni/h5pImp.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5plImp.c b/java/src/jni/h5plImp.c
index 34d6f8b..09a1032 100644
--- a/java/src/jni/h5plImp.c
+++ b/java/src/jni/h5plImp.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5rImp.c b/java/src/jni/h5rImp.c
index 647f973..3dcbb8d 100644
--- a/java/src/jni/h5rImp.c
+++ b/java/src/jni/h5rImp.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
#ifdef __cplusplus
diff --git a/java/src/jni/h5sImp.c b/java/src/jni/h5sImp.c
index d996ae5..929f6d6 100644
--- a/java/src/jni/h5sImp.c
+++ b/java/src/jni/h5sImp.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5tImp.c b/java/src/jni/h5tImp.c
index 1467b41..26f9b5c 100644
--- a/java/src/jni/h5tImp.c
+++ b/java/src/jni/h5tImp.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5util.c b/java/src/jni/h5util.c
index 0d2999a..17ed35e 100644
--- a/java/src/jni/h5util.c
+++ b/java/src/jni/h5util.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5util.h b/java/src/jni/h5util.h
index f690e8b..6194378 100644
--- a/java/src/jni/h5util.h
+++ b/java/src/jni/h5util.h
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/h5zImp.c b/java/src/jni/h5zImp.c
index 2c8d8c3..247d1cc 100644
--- a/java/src/jni/h5zImp.c
+++ b/java/src/jni/h5zImp.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
diff --git a/java/src/jni/nativeData.c b/java/src/jni/nativeData.c
index 8388c99..a123e0f 100644
--- a/java/src/jni/nativeData.c
+++ b/java/src/jni/nativeData.c
@@ -15,7 +15,7 @@
/*
* For details of the HDF libraries, see the HDF Documentation at:
- * http://hdfdfgroup.org/HDF5/doc/
+ * http://hdfgroup.org/HDF5/doc/
*
*/
/*
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index f372acf..cbab6fe 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -750,7 +750,7 @@ if (NOT CYGWIN)
endif ()
set_tests_properties (H5TEST-cache PROPERTIES
DEPENDS H5TEST-clear-cache-objects
- ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=${HDF_TEST_EXPRESS}"
+ ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=3"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
set_tests_properties (H5TEST-cache PROPERTIES TIMEOUT 1800)
@@ -768,7 +768,7 @@ add_test (
add_test (NAME H5TEST-cache_image COMMAND $<TARGET_FILE:cache_image>)
set_tests_properties (H5TEST-cache_image PROPERTIES
DEPENDS H5TEST-clear-cache_image-objects
- ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST"
+ ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=3"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)