[Linux-NTFS-cvs] CVS: ntfsprogs/test Makefile.am,1.2,1.3

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5805

Modified Files:
	Makefile.am 
Log Message:
Fix "make test".


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/test/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile.am	20 Sep 2005 19:24:09 -0000	1.2
+++ Makefile.am	7 Oct 2005 12:41:34 -0000	1.3
@@ -12,9 +12,8 @@ endif
 LINK=$(STATIC_LINK) $(LIBTOOL_LINK)
 
 #TEST_VALGRIND		= valgrind
-TEST_RUNLIST		= runlist
 
-bin_PROGRAMS		= $(TEST_RUNLIST)
+bin_PROGRAMS		= runlist
 
 CLEANFILES		= attr[123].bin frag[123][123][123] pure-[cn][ms] zero
 MAINTAINERCLEANFILES	= Makefile.in
@@ -33,26 +32,26 @@ runlist_LDFLAGS		= $(AM_LFLAGS)
 libs:
 	(cd ../libntfs && $(MAKE) libs) || exit 1;
 
-test:	$(TEST_RUNLIST) testz testp testf
+test:	runlist testz testp testf
 
-testz:	$(TEST_RUNLIST)
-	@$(TEST_VALGRIND) $(TEST_RUNLIST) zero > zero
+testz:	runlist
+	@$(TEST_VALGRIND) ./runlist zero > zero
 	@diff -qs {runlist-data/,}zero
 
-testp:	$(TEST_RUNLIST)
+testp:	runlist
 	@for i in contig noncontig; do						\
 		for j in single multi; do					\
 			L1=`echo $$i | cut -b1`;				\
 			L2=`echo $$j | cut -b1`;				\
 			FILE=pure-$$L1$$L2;					\
-			$(TEST_VALGRIND) $(TEST_RUNLIST) pure $$i $$j > $$FILE;	\
+			$(TEST_VALGRIND) ./runlist pure $$i $$j > $$FILE;	\
 			diff -qs {runlist-data/,}$$FILE;			\
 		done;								\
 	done
 
-testf:	$(TEST_RUNLIST)
+testf:	runlist
 	@for i in 123 132 213 231 312 321; do					\
-		$(TEST_VALGRIND) $(TEST_RUNLIST) frag $$i > frag$$i;		\
+		$(TEST_VALGRIND) ./runlist frag $$i > frag$$i;		\
 		diff -qs {runlist-data/,}frag$$i;				\
 	done