Cleanup makefiles. Remove obsolete, broken and non-standard test suite.

4 files changed, 9 insertions, 45 deletions

diff --git a/Makefile b/Makefile
index aa501d59..c8bc724e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PREFIX = 
+PREFIX =
 BINDIR = $(PREFIX)/usr/bin
 MANDIR = $(PREFIX)/usr/man
 SBINDIR = $(PREFIX)/usr/sbin
@@ -12,23 +12,19 @@ RPM=$(HOME)/rpm
 NAME = urpmi
 TAR = $(NAME).tar.bz2
 
-.PHONY: install clean rpm test bigtest perltest changelog ChangeLog
+.PHONY: install clean rpm test ChangeLog
 
 install:
 	$(MAKE) -C po $@
 	install -d $(BINDIR) $(SBINDIR) $(URPMIDIR) $(URPMIDIR2) $(MANDIR)/man5 $(MANDIR)/man8
 	install urpmq $(BINDIR)
 	install rpm-find-leaves urpmf $(BINDIR)
-#	install -m 644 autoirpm.deny $(URPMIDIR2)
 	install -m 644 skip.list $(URPMIDIR2)
 	install -m 644 man/C/urpm*.5 $(MANDIR)/man5
 	install -m 644 man/C/proxy*.5 $(MANDIR)/man5
 	install -m 644 man/C/urpm*.8 $(MANDIR)/man8
 	install -m 644 man/C/rurpmi.8 $(MANDIR)/man8
 	install urpmi urpme urpmi.addmedia urpmi.update urpmi.removemedia rurpmi $(SBINDIR)
-#	install -s autoirpm.update-all $(SBINDIR)
-#	ln -sf urpmi.addmedia $(SBINDIR)/urpmi.removemedia
-#	ln -sf urpmi.addmedia $(SBINDIR)/urpmi.update
 	install gurpmi $(BINDIR)
 	install gurpmi2 $(SBINDIR)
 	ln -s -f ../../usr/bin/consolehelper $(BINDIR)/gurpmi2
@@ -37,21 +33,16 @@ install:
 		install -m 644 $$i/urpm*.8 $(MANDIR)/`basename $$i`/man8 ; \
 	done	
 
-autoirpm.update-all: %: %.cc 
+autoirpm.update-all: %: %.cc
 	$(CXX) $(CFLAGS) $< $(LIBRPM) -o $@
 
-test: bigtest perltest
-
-perltest:
+test:
 	prove t/*.t
 
-bigtest:
-	cd test; ./do_alltests
-
 tar: clean
 	cd .. ; tar cf - urpmi | bzip2 -9 >$(TAR)
 
-rpm: tar 
+rpm: tar
 	cp -f ../$(TAR) $(RPM)/SOURCES
 	cp -f $(NAME).spec $(RPM)/SPECS/
 	-rpm -ba --clean $(NAME).spec
@@ -64,10 +55,6 @@ clean:
 	$(MAKE) -C po $@
 	rm -f *~ autoirpm.update-all
 
-changelog:
+ChangeLog:
 	cvs2cl -W 400 -I ChangeLog --accum -U ../../soft/common/username
 	rm -f *.bak
-
-log:	changelog
-
-ChangeLog: changelog
diff --git a/po/Makefile b/po/Makefile
index c9c329cb..d15e46e8 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -4,8 +4,8 @@ localedir = $(PREFIX)/usr/share/locale
 PGOAL = urpmi
 
 # perl files to search translatable strings in
-PL_FILES = ../_irpm ../rpm-find-leaves ../urpm.pm ../urpme ../urpmf \
-	../urpmi ../urpmi.addmedia ../gurpmi ../gurpmi2 \
+PL_FILES = ../rpm-find-leaves ../urpm.pm ../urpme ../urpmf \
+	../urpmi ../urpmi.addmedia ../gurpmi ../gurpmi2 ../gurpmi.pm \
 	../urpmi.removemedia ../urpmi.update ../urpmq \
 	../urpm/parallel_ka_run.pm  ../urpm/parallel_ssh.pm \
 	../urpm/msg.pm ../urpm/args.pm ../rurpmi
@@ -18,7 +18,6 @@ LANGS = $(POFILES:%.po=%)
 
 GOALS = $(PGOAL).pot  $(MOFILES)
 
-
 all: $(GOALS)
 
 %.mo: %.po
@@ -50,6 +49,6 @@ install: all
 	done
 
 clean:
-	@rm -rf *~ *.mo $(GOALS) placeholder.pot $(PGOAL)_tmp.pot 
+	@rm -rf *~ *.mo $(GOALS) placeholder.pot $(PGOAL)_tmp.pot
 
 
diff --git a/test/bugkernel22.tar.bz2 b/test/bugkernel22.tar.bz2
deleted file mode 100644
index dd96ded9..00000000
--- a/test/bugkernel22.tar.bz2
+++ /dev/null
diff --git a/test/do_alltests b/test/do_alltests
deleted file mode 100755
index 90ef6ae9..00000000
--- a/test/do_alltests
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-LANGUAGE=C
-LANG=C
-export LANGUAGE
-export LANG
-
-for t in *.tar.bz2; do
-    rm -rf tmp
-    mkdir tmp
-    cd tmp
-    tar xvfj ../$t
-    dir=$(dirname $(find . -name dotest))
-    cd $dir
-    ./dotest || exit 1
-    perl -pi -e 's/.*urpmi called with.*//' urpmi_env.log urpmi_env_correct.log
-    diff urpmi_env.log urpmi_env_correct.log || exit 2
-    cd -
-    cd ..
-done
-
-rm -rf tmp