1 files changed, 18 insertions, 4 deletions
diff --git a/fortran/examples/run-fortran-ex.sh.in b/fortran/examples/run-fortran-ex.sh.in
index b29eaaf..2ab4aef 100755
--- a/fortran/examples/run-fortran-ex.sh.in
+++ b/fortran/examples/run-fortran-ex.sh.in
@@ -49,17 +49,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
 }
 
 
@@ -70,19 +71,33 @@ RunTest()
 if [ $? -eq 0 ]
 then
     if (RunTest dsetexample &&\
+        rm dsetexample &&\
         RunTest fileexample &&\
+        rm fileexample &&\
         RunTest rwdsetexample &&\
+        rm rwdsetexample &&\
         RunTest attrexample &&\
+        rm attrexample &&\
         RunTest groupexample &&\
+        rm groupexample &&\
         RunTest grpsexample &&\
+        rm grpsexample &&\
         RunTest grpdsetexample &&\
+        rm grpdsetexample &&\
         RunTest hyperslab &&\
+        rm hyperslab &&\
         RunTest selectele &&\
+        rm selectele &&\
         RunTest grpit &&\
+        rm grpit &&\
         RunTest refobjexample &&\
+        rm refobjexample &&\
         RunTest refregexample &&\
+        rm refregexample &&\
         RunTest mountexample &&\
-        RunTest compound); then
+        rm mountexample &&\
+        RunTest compound &&\
+        rm compound); then
         EXIT_VALUE=${EXIT_SUCCESS}
     else
         EXIT_VALUE=${EXIT_FAILURE}
@@ -90,7 +105,6 @@ then
 fi
 
 # Cleanup
-rm a.out
 rm *.o
 rm *.h5
 echo