From 15679022628d7bd232c1b6e234fa6b220e15dc12 Mon Sep 17 00:00:00 2001
From: Albert Cheng <acheng@hdfgroup.org>
Date: Thu, 2 Jun 2005 22:46:44 -0500
Subject: [svn-r10850] Purpose: Improvement.

Description:
assign testph5diff.sh to the Parallel test scripts so that
it will be tested for the check-p target.

Platforms tested:
heping pp.

Misc. update:
---
 tools/h5diff/Makefile.am | 9 +++------
 tools/h5diff/Makefile.in | 8 +++-----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/tools/h5diff/Makefile.am b/tools/h5diff/Makefile.am
index d975be4..9dbe53a 100644
--- a/tools/h5diff/Makefile.am
+++ b/tools/h5diff/Makefile.am
@@ -26,10 +26,7 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
 # is enabled.
 if BUILD_PARALLEL_CONDITIONAL
   H5PDIFF=ph5diff
-  H5DIFF_SCRIPT=$(srcdir)/testh5diff.sh $(srcdir)/testph5diff.sh
-else
-  H5PDIFF=
-  H5DIFF_SCRIPT=$(srcdir)/testh5diff.sh
+  TEST_SCRIPT_PARA=$(srcdir)/testph5diff.sh
 endif
 
 # Our main target, h5diff
@@ -37,10 +34,10 @@ bin_PROGRAMS=h5diff $(H5PDIFF)
 
 # Test programs and scripts
 TEST_PROG=h5difftst
-TEST_SCRIPT=$(H5DIFF_SCRIPT)
+TEST_SCRIPT=$(srcdir)/testh5diff.sh
 
 check_PROGRAMS=$(TEST_PROG)
-check_SCRIPTS=$(TEST_SCRIPT)
+check_SCRIPTS=$(TEST_SCRIPT) $(TEST_SCRIPT_PARA)
 
 # Source files for the program
 h5diff_SOURCES=h5diff_main.c h5diff_common.c
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 310befd..b7c6df4 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -314,18 +314,16 @@ H5FC_PP = $(bindir)/h5pfc
 
 # Include src and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
-@BUILD_PARALLEL_CONDITIONAL_FALSE@H5PDIFF = 
 
 # Always build and test h5diff but build and test ph5diff only if parallel
 # is enabled.
 @BUILD_PARALLEL_CONDITIONAL_TRUE@H5PDIFF = ph5diff
-@BUILD_PARALLEL_CONDITIONAL_FALSE@H5DIFF_SCRIPT = $(srcdir)/testh5diff.sh
-@BUILD_PARALLEL_CONDITIONAL_TRUE@H5DIFF_SCRIPT = $(srcdir)/testh5diff.sh $(srcdir)/testph5diff.sh
+@BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_SCRIPT_PARA = $(srcdir)/testph5diff.sh
 
 # Test programs and scripts
 TEST_PROG = h5difftst
-TEST_SCRIPT = $(H5DIFF_SCRIPT)
-check_SCRIPTS = $(TEST_SCRIPT)
+TEST_SCRIPT = $(srcdir)/testh5diff.sh
+check_SCRIPTS = $(TEST_SCRIPT) $(TEST_SCRIPT_PARA)
 
 # Source files for the program
 h5diff_SOURCES = h5diff_main.c h5diff_common.c
-- 
cgit v0.12