summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2011-04-12 17:58:57 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2011-04-12 17:58:57 (GMT)
commit60abcfd2e85c005266afb82f755f773808203c6c (patch)
tree2ab10a6ca9c08e8f243ffea6a3b3a7ab331ad19f /hl
parente4c6ef2f06a9e85ab7485eaab6b4b5fad699c8e3 (diff)
downloadhdf5-60abcfd2e85c005266afb82f755f773808203c6c.zip
hdf5-60abcfd2e85c005266afb82f755f773808203c6c.tar.gz
hdf5-60abcfd2e85c005266afb82f755f773808203c6c.tar.bz2
[svn-r20482]
Fixed issue HDFFV-5866 (BZ 2156). Changed scripts to run examples to use specific names for compiled executable files instead of a.out, which did not work on Cywin as it produces a.exe by default. Removed issue from known problems section of RELEASE.txt. Tested with Cygwin 1.7.8 on Windows 7. This line, and those below, will be ignored-- M release_docs/RELEASE.txt M hl/c++/examples/run-hlc++-ex.sh.in M hl/fortran/examples/run-hlfortran-ex.sh.in M hl/examples/run-hlc-ex.sh.in M c++/examples/run-c++-ex.sh.in M fortran/examples/run-fortran-ex.sh.in M examples/run-c-ex.sh.in
Diffstat (limited to 'hl')
-rwxr-xr-xhl/c++/examples/run-hlc++-ex.sh.in10
-rwxr-xr-xhl/examples/run-hlc-ex.sh.in28
-rwxr-xr-xhl/fortran/examples/run-hlfortran-ex.sh.in9
3 files changed, 35 insertions, 12 deletions
diff --git a/hl/c++/examples/run-hlc++-ex.sh.in b/hl/c++/examples/run-hlc++-ex.sh.in
index d43606e..b800981 100755
--- a/hl/c++/examples/run-hlc++-ex.sh.in
+++ b/hl/c++/examples/run-hlc++-ex.sh.in
@@ -42,17 +42,18 @@ H5TOOL_BIN="${prefix}/bin/${H5TOOL}" # The path of the tool binary
#### Run test ####
RunTest()
{
+ TEST_EXEC=$1
Test=$1".cpp"
echo
echo "################# $1 #################"
- ${H5TOOL_BIN} $Test
+ ${H5TOOL_BIN} -o $TEST_EXEC $Test
if [ $? -ne 0 ]
then
echo "messed up compiling $Test"
exit 1
fi
- ./a.out
+ ./$TEST_EXEC
}
@@ -63,7 +64,9 @@ RunTest()
if [ $? -eq 0 ]
then
if (RunTest ptExampleFL &&\
- RunTest ptExampleVL); then
+ rm ptExampleFL &&\
+ RunTest ptExampleVL &&\
+ rm ptExampleVL); then
EXIT_VALUE=${EXIT_SUCCESS}
else
EXIT_VALUE=${EXIT_FAILURE}
@@ -71,7 +74,6 @@ then
fi
# Cleanup
-rm a.out
rm *.o
rm *.h5
echo
diff --git a/hl/examples/run-hlc-ex.sh.in b/hl/examples/run-hlc-ex.sh.in
index 86c6276..ae3fcdb 100755
--- a/hl/examples/run-hlc-ex.sh.in
+++ b/hl/examples/run-hlc-ex.sh.in
@@ -47,17 +47,18 @@ H5TOOL_BIN="${prefix}/bin/${H5TOOL}" # The path of the tool binary
#### Run test ####
RunTest()
{
+ TEST_EXEC=$1
Test=$1".c"
echo
echo "################# $1 #################"
- ${H5TOOL_BIN} $Test
+ ${H5TOOL_BIN} -o $TEST_EXEC $Test
if [ $? -ne 0 ]
then
echo "messed up compiling $Test"
exit 1
fi
- ./a.out
+ ./$TEST_EXEC
}
@@ -68,25 +69,45 @@ RunTest()
if [ $? -eq 0 ]
then
if (RunTest ex_lite1 &&\
+ rm ex_lite1 &&\
RunTest ex_lite2 &&\
+ rm ex_lite2 &&\
RunTest ex_lite3 &&\
+ rm ex_lite3 &&\
RunTest ptExampleFL &&\
+ rm ptExampleFL &&\
RunTest ptExampleVL &&\
+ rm ptExampleVL &&\
RunTest ex_image1 &&\
+ rm ex_image1 &&\
RunTest ex_image2 &&\
+ rm ex_image2 &&\
RunTest ex_table_01 &&\
+ rm ex_table_01 &&\
RunTest ex_table_02 &&\
+ rm ex_table_02 &&\
RunTest ex_table_03 &&\
+ rm ex_table_03 &&\
RunTest ex_table_04 &&\
+ rm ex_table_04 &&\
RunTest ex_table_05 &&
+ rm ex_table_05 &&
RunTest ex_table_06 &&\
+ rm ex_table_06 &&\
RunTest ex_table_07 &&\
+ rm ex_table_07 &&\
RunTest ex_table_08 &&\
+ rm ex_table_08 &&\
RunTest ex_table_09 &&\
+ rm ex_table_09 &&\
RunTest ex_table_10 &&\
+ rm ex_table_10 &&\
RunTest ex_table_11 &&\
+ rm ex_table_11 &&\
RunTest ex_table_12 &&\
- RunTest ex_ds1); then
+ rm ex_table_12 &&\
+ RunTest ex_ds1 &&\
+ rm ex_ds1); then
EXIT_VALUE=${EXIT_SUCCESS}
else
EXIT_VALUE=${EXIT_FAILURE}
@@ -94,7 +115,6 @@ then
fi
# Cleanup
-rm a.out
rm *.o
rm *.h5
echo
diff --git a/hl/fortran/examples/run-hlfortran-ex.sh.in b/hl/fortran/examples/run-hlfortran-ex.sh.in
index 364b438..919771d 100755
--- a/hl/fortran/examples/run-hlfortran-ex.sh.in
+++ b/hl/fortran/examples/run-hlfortran-ex.sh.in
@@ -48,17 +48,18 @@ H5TOOL_BIN="${prefix}/bin/${H5TOOL}" # The path of the tool binary
#### Run test ####
RunTest()
{
+ TEST_EXEC=$1
Test=$1".f90"
echo
echo "################# $1 #################"
- ${H5TOOL_BIN} $Test
+ ${H5TOOL_BIN} -o $TEST_EXEC $Test
if [ $? -ne 0 ]
then
echo "messed up compiling $Test"
exit 1
fi
- ./a.out
+ ./$TEST_EXEC
}
@@ -68,7 +69,8 @@ RunTest()
# Run tests
if [ $? -eq 0 ]
then
- if (RunTest exlite); then
+ if (RunTest exlite &&\
+ rm exlite); then
EXIT_VALUE=${EXIT_SUCCESS}
else
EXIT_VALUE=${EXIT_FAILURE}
@@ -76,7 +78,6 @@ then
fi
# Cleanup
-rm a.out
rm *.o
rm *.h5
echo