From: jbj Date: Tue, 20 Oct 1998 11:54:13 +0000 (+0000) Subject: First attempt at "make check". X-Git-Tag: rpm-4.4-release~3398 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5fc8cb62a550c25c2d688b1c85fee56203ad1d66;p=platform%2Fupstream%2Frpm.git First attempt at "make check". CVS patchset: 2465 CVS date: 1998/10/20 11:54:13 --- diff --git a/.cvsignore b/.cvsignore index d3c5e62..663072c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -5,6 +5,7 @@ Makefile rpm rpm.shared rpm2cpio +rpmconvert lib-rpmrc macros config.h diff --git a/Makefile.am b/Makefile.am index 952e6d7..775ca86 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.3 foreign -SUBDIRS = popt build lib po intl misc tools scripts +SUBDIRS = popt build lib po intl misc tools scripts tests INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/intl @INCPATH@ @@ -48,8 +48,9 @@ rpmconvert_SOURCES = convertdb.c oldrpmdb.c rpmconvert_LDADD = -lrpmbuild -lpopt -lrpm -lgdbm install-data-local: - @rm -f $(libdir)/rpmrc && ln -s rpm/rpmrc $(DESTDIR)/$(libdir)/rpmrc - @rm -f $(libdir)/rpmpopt && ln -s rpm/rpmpopt $(DESTDIR)/$(libdir)/rpmpopt + @$(mkinstalldirs) $(DESTDIR)/var/tmp $(DESTDIR)/var/lib/rpm + @rm -f $(DESTDIR)/$(libdir)/rpmrc && ln -s rpm/rpmrc $(DESTDIR)/$(libdir)/rpmrc + @rm -f $(DESTDIR)/$(libdir)/rpmpopt && ln -s rpm/rpmpopt $(DESTDIR)/$(libdir)/rpmpopt # FIXME: these should be generated in configure.in find-requires: find-requires.sh diff --git a/Makefile.in b/Makefile.in index 01d179a..2c2e05f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -113,12 +113,13 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ l = @l@ +testdir = @testdir@ tmpdir = @tmpdir@ varprefix = @varprefix@ AUTOMAKE_OPTIONS = 1.3 foreign -SUBDIRS = popt build lib po intl misc tools scripts +SUBDIRS = popt build lib po intl misc tools scripts tests INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/intl @INCPATH@ @@ -692,8 +693,9 @@ rpm.o: rpm.c include ./Makefile.inc install-data-local: - @rm -f $(libdir)/rpmrc && ln -s rpm/rpmrc $(DESTDIR)/$(libdir)/rpmrc - @rm -f $(libdir)/rpmpopt && ln -s rpm/rpmpopt $(DESTDIR)/$(libdir)/rpmpopt + @$(mkinstalldirs) $(DESTDIR)/var/tmp $(DESTDIR)/var/lib/rpm + @rm -f $(DESTDIR)/$(libdir)/rpmrc && ln -s rpm/rpmrc $(DESTDIR)/$(libdir)/rpmrc + @rm -f $(DESTDIR)/$(libdir)/rpmpopt && ln -s rpm/rpmpopt $(DESTDIR)/$(libdir)/rpmpopt # FIXME: these should be generated in configure.in find-requires: find-requires.sh diff --git a/build/Makefile.in b/build/Makefile.in index c0645fc..18953c3 100644 --- a/build/Makefile.in +++ b/build/Makefile.in @@ -69,6 +69,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ +FINDPROVIDES = @FINDPROVIDES@ +FINDREQUIRES = @FINDREQUIRES@ FIXPERMS = @FIXPERMS@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ @@ -86,8 +88,11 @@ LDFLAGS_STATIC = @LDFLAGS_STATIC@ LIBDL = @LIBDL@ LIBMISC = @LIBMISC@ LIBOBJS = @LIBOBJS@ +LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@ +LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@ LIBS = @LIBS@ LN_S = @LN_S@ +MACROFILES = @MACROFILES@ MAKEINFO = @MAKEINFO@ MISCDIR = @MISCDIR@ MISCPATH = @MISCPATH@ @@ -108,6 +113,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ l = @l@ +testdir = @testdir@ tmpdir = @tmpdir@ varprefix = @varprefix@ diff --git a/configure.in b/configure.in index 65fdc64..d0e92cf 100644 --- a/configure.in +++ b/configure.in @@ -600,6 +600,10 @@ MACROFILES="${RPMCONFIGDIR}/macros" AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES") AC_SUBST(MACROFILES) +testdir="`pwd`/tests" +dnl AC_DEFINE_UNQUOTED(testdir, "$testdir") +AC_SUBST(testdir) + AC_SUBST(LIBOBJS) AC_SUBST(INCPATH) @@ -625,5 +629,6 @@ export LIBS INCPATH AC_CONFIG_SUBDIRS(popt) AC_OUTPUT([Makefile Makefile.inc lib-rpmrc macros lib/Makefile build/Makefile tools/Makefile scripts/Makefile + tests/Makefile tests/rpmrc tests/hello-test/Makefile misc/Makefile po/Makefile.in intl/Makefile], [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) diff --git a/lib/Makefile.in b/lib/Makefile.in index 34ba781..b26a956 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -69,6 +69,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ +FINDPROVIDES = @FINDPROVIDES@ +FINDREQUIRES = @FINDREQUIRES@ FIXPERMS = @FIXPERMS@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ @@ -86,8 +88,11 @@ LDFLAGS_STATIC = @LDFLAGS_STATIC@ LIBDL = @LIBDL@ LIBMISC = @LIBMISC@ LIBOBJS = @LIBOBJS@ +LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@ +LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@ LIBS = @LIBS@ LN_S = @LN_S@ +MACROFILES = @MACROFILES@ MAKEINFO = @MAKEINFO@ MISCDIR = @MISCDIR@ MISCPATH = @MISCPATH@ @@ -108,6 +113,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ l = @l@ +testdir = @testdir@ tmpdir = @tmpdir@ varprefix = @varprefix@ diff --git a/lib/macro.c b/lib/macro.c index aa4aa4c..c8441eb 100644 --- a/lib/macro.c +++ b/lib/macro.c @@ -32,7 +32,8 @@ typedef struct MacroBuf { static int expandMacro(MacroBuf *mb); -int max_macro_depth = 2; +#define MAX_MACRO_DEPTH 5 +int max_macro_depth = MAX_MACRO_DEPTH; #ifdef DEBUG_MACROS int print_macro_trace = 0; @@ -1132,7 +1133,7 @@ initMacros(MacroContext *mc, const char *macrofile) if (first) { mc->macroTable = NULL; expandMacroTable(mc); - max_macro_depth = 2; /* XXX Assume good ol' macro expansion */ + max_macro_depth = MAX_MACRO_DEPTH; /* XXX Assume good ol' macro expansion */ first = 0; } diff --git a/macros.in b/macros.in index fe1d174..556dcf9 100644 --- a/macros.in +++ b/macros.in @@ -8,9 +8,9 @@ #============================================================================== # ---- filesystem macros. # -%_usr @prefix@ -%_usrsrc %{_usr}/src -%_var @varprefix@ +%_usr @prefix@ +%_usrsrc %{_usr}/src +%_var @varprefix@ #============================================================================== # ---- path macros @@ -41,7 +41,7 @@ %_buildos Linux %_bzip2bin @BZIP2BIN@ %_dbpath %{_var}/lib/rpm -%_defaultdocdir %{_prefix}/doc +%_defaultdocdir %{_usr}/doc %_fixperms @FIXPERMS@ %_gzipbin @GZIPBIN@ %_rpmdir %{_topdir}/RPMS @@ -75,3 +75,17 @@ } #============================================================================== +# ---- configure macros. +# Macro(s) similar to those used by configure. +# +%_build @build@ +%_build_alias @build_alias@ +%_build_cpu @build_cpu@ +%_build_vendor @build_vendor@ +%_build_os @build_os@ +%_host @host@ +%_host_alias @host_alias@ +%_host_cpu @host_cpu@ +%_host_vendor @host_vendor@ +%_host_os @host_os@ +%_prefix @prefix@ diff --git a/misc/Makefile.in b/misc/Makefile.in index 55fd0a7..ee27310 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -69,6 +69,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ +FINDPROVIDES = @FINDPROVIDES@ +FINDREQUIRES = @FINDREQUIRES@ FIXPERMS = @FIXPERMS@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ @@ -86,8 +88,11 @@ LDFLAGS_STATIC = @LDFLAGS_STATIC@ LIBDL = @LIBDL@ LIBMISC = @LIBMISC@ LIBOBJS = @LIBOBJS@ +LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@ +LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@ LIBS = @LIBS@ LN_S = @LN_S@ +MACROFILES = @MACROFILES@ MAKEINFO = @MAKEINFO@ MISCDIR = @MISCDIR@ MISCPATH = @MISCPATH@ @@ -108,6 +113,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ l = @l@ +testdir = @testdir@ tmpdir = @tmpdir@ varprefix = @varprefix@ diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 0ac6acc..d2bb73b 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -56,11 +56,13 @@ depend: install: for n in $(CATALOGS); do \ l=`basename $$n .mo`; \ - $(INSTALL) -m 755 -d $(installprefix)/$(RPMNLSDIR)/$$l; \ - $(INSTALL) -m 755 -d $(installprefix)/$(RPMNLSDIR)/$$l/LC_MESSAGES; \ - $(INSTALL) -m 644 $$n $(installprefix)/$(RPMNLSDIR)/$$l/LC_MESSAGES/rpm.mo; \ + $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l; \ + $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES; \ + $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/rpm.mo; \ done +check: + POTFILES: POTFILES.in ( if test 'x$(srcdir)' != 'x.'; then \ posrcprefix='$(top_srcdir)/'; \ diff --git a/po/rpm.pot b/po/rpm.pot index 69b2a4b..c94c45d 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1998-10-14 14:01-0400\n" +"POT-Creation-Date: 1998-10-19 16:52-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1137,283 +1137,283 @@ msgstr "" msgid "rebuild database from existing database" msgstr "" -#: ../rpm.c:634 ../rpm.c:640 ../rpm.c:647 ../rpm.c:653 ../rpm.c:662 -#: ../rpm.c:669 ../rpm.c:715 ../rpm.c:721 ../rpm.c:810 ../rpm.c:817 -#: ../rpm.c:823 ../rpm.c:831 ../rpm.c:837 ../rpm.c:845 ../rpm.c:878 -#: ../rpm.c:924 ../rpm.c:931 +#: ../rpm.c:642 ../rpm.c:648 ../rpm.c:655 ../rpm.c:661 ../rpm.c:670 +#: ../rpm.c:677 ../rpm.c:723 ../rpm.c:729 ../rpm.c:818 ../rpm.c:825 +#: ../rpm.c:831 ../rpm.c:839 ../rpm.c:845 ../rpm.c:853 ../rpm.c:886 +#: ../rpm.c:932 ../rpm.c:939 msgid "only one major mode may be specified" msgstr "" -#: ../rpm.c:655 +#: ../rpm.c:663 msgid "-u and --uninstall are deprecated and no longer work.\n" msgstr "" -#: ../rpm.c:657 +#: ../rpm.c:665 msgid "Use -e or --erase instead.\n" msgstr "" -#: ../rpm.c:673 +#: ../rpm.c:681 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument" msgstr "" -#: ../rpm.c:677 +#: ../rpm.c:685 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument" msgstr "" -#: ../rpm.c:744 ../rpm.c:751 ../rpm.c:759 ../rpm.c:767 ../rpm.c:787 -#: ../rpm.c:795 ../rpm.c:803 +#: ../rpm.c:752 ../rpm.c:759 ../rpm.c:767 ../rpm.c:775 ../rpm.c:795 +#: ../rpm.c:803 ../rpm.c:811 msgid "one type of query/verify may be performed at a time" msgstr "" -#: ../rpm.c:853 +#: ../rpm.c:861 msgid "arguments to --dbpath must begin with a /" msgstr "" -#: ../rpm.c:860 +#: ../rpm.c:868 msgid "one type of query may be performed at a time" msgstr "" -#: ../rpm.c:884 +#: ../rpm.c:892 msgid "relocations must begin with a /" msgstr "" -#: ../rpm.c:886 +#: ../rpm.c:894 msgid "relocations must contain a =" msgstr "" -#: ../rpm.c:889 +#: ../rpm.c:897 msgid "relocations must have a / following the =" msgstr "" -#: ../rpm.c:901 +#: ../rpm.c:909 msgid "Internal error in argument processing :-(\n" msgstr "" -#: ../rpm.c:944 +#: ../rpm.c:952 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: ../rpm.c:949 +#: ../rpm.c:957 msgid "--timecheck may only be used during package builds" msgstr "" -#: ../rpm.c:952 ../rpm.c:955 +#: ../rpm.c:960 ../rpm.c:963 msgid "unexpected query specifiers" msgstr "" -#: ../rpm.c:959 +#: ../rpm.c:967 msgid "unexpected query source" msgstr "" -#: ../rpm.c:962 +#: ../rpm.c:970 msgid "only installation and upgrading may be forced" msgstr "" -#: ../rpm.c:965 +#: ../rpm.c:973 msgid "files may only be relocated during package installation" msgstr "" -#: ../rpm.c:968 +#: ../rpm.c:976 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: ../rpm.c:971 +#: ../rpm.c:979 msgid "--relocate may only be used when installing new packages" msgstr "" -#: ../rpm.c:974 +#: ../rpm.c:982 msgid "--prefix may only be used when installing new packages" msgstr "" -#: ../rpm.c:977 +#: ../rpm.c:985 msgid "arguments to --prefix must begin with a /" msgstr "" -#: ../rpm.c:980 +#: ../rpm.c:988 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: ../rpm.c:984 +#: ../rpm.c:992 msgid "--percent may only be specified during package installation" msgstr "" -#: ../rpm.c:988 +#: ../rpm.c:996 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: ../rpm.c:992 +#: ../rpm.c:1000 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: ../rpm.c:996 +#: ../rpm.c:1004 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: ../rpm.c:1000 +#: ../rpm.c:1008 msgid "--includedocs may only be specified during package installation" msgstr "" -#: ../rpm.c:1004 +#: ../rpm.c:1012 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: ../rpm.c:1008 +#: ../rpm.c:1016 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: ../rpm.c:1012 +#: ../rpm.c:1020 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: ../rpm.c:1016 +#: ../rpm.c:1024 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: ../rpm.c:1020 +#: ../rpm.c:1028 msgid "--allfiles may only be specified during package installation" msgstr "" -#: ../rpm.c:1024 +#: ../rpm.c:1032 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: ../rpm.c:1029 +#: ../rpm.c:1037 msgid "" "--noscripts may only be specified during package installation, erasure, and " "verification" msgstr "" -#: ../rpm.c:1033 +#: ../rpm.c:1041 msgid "" "--notriggers may only be specified during package installation, erasure, and " "verification" msgstr "" -#: ../rpm.c:1038 +#: ../rpm.c:1046 msgid "" "--nodeps may only be specified during package installation, erasure, and " "verification" msgstr "" -#: ../rpm.c:1042 +#: ../rpm.c:1050 msgid "--nofiles may only be specified during package verification" msgstr "" -#: ../rpm.c:1047 +#: ../rpm.c:1055 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: ../rpm.c:1052 +#: ../rpm.c:1060 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: ../rpm.c:1057 +#: ../rpm.c:1065 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: ../rpm.c:1060 +#: ../rpm.c:1068 msgid "--clean may only be used with -b and -t" msgstr "" -#: ../rpm.c:1063 +#: ../rpm.c:1071 msgid "--rmsource may only be used with -b and -t" msgstr "" -#: ../rpm.c:1066 +#: ../rpm.c:1074 msgid "--short-circuit may only be used during package building" msgstr "" -#: ../rpm.c:1070 +#: ../rpm.c:1078 msgid "--short-circuit may only be used with -bc, -bi, -bs, -tc -ti, or -ts" msgstr "" -#: ../rpm.c:1075 +#: ../rpm.c:1083 msgid "--oldpackage may only be used during upgrades" msgstr "" -#: ../rpm.c:1078 +#: ../rpm.c:1086 msgid "--dump may only be used during queries" msgstr "" -#: ../rpm.c:1081 +#: ../rpm.c:1089 msgid "--dump of queries must be used with -l, -c, or -d" msgstr "" -#: ../rpm.c:1086 +#: ../rpm.c:1094 msgid "" "ftp options can only be used during package queries, installs, and upgrades" msgstr "" -#: ../rpm.c:1093 +#: ../rpm.c:1101 msgid "--nopgp may only be used during signature checking" msgstr "" -#: ../rpm.c:1096 +#: ../rpm.c:1104 msgid "" "--nopgp may only be used during signature checking and package verification" msgstr "" -#: ../rpm.c:1109 +#: ../rpm.c:1117 msgid "Pass phrase check failed\n" msgstr "" -#: ../rpm.c:1112 +#: ../rpm.c:1120 msgid "Pass phrase is good.\n" msgstr "" -#: ../rpm.c:1124 +#: ../rpm.c:1132 msgid "--sign may only be used during package building" msgstr "" -#: ../rpm.c:1139 +#: ../rpm.c:1147 msgid "exec failed\n" msgstr "" -#: ../rpm.c:1158 +#: ../rpm.c:1166 msgid "unexpected arguments to --querytags " msgstr "" -#: ../rpm.c:1169 +#: ../rpm.c:1177 msgid "no packages given for signature check" msgstr "" -#: ../rpm.c:1176 +#: ../rpm.c:1184 msgid "no packages given for signing" msgstr "" -#: ../rpm.c:1185 +#: ../rpm.c:1193 msgid "no packages files given for rebuild" msgstr "" -#: ../rpm.c:1248 +#: ../rpm.c:1256 msgid "no spec files given for build" msgstr "" -#: ../rpm.c:1250 +#: ../rpm.c:1258 msgid "no tar files given for build" msgstr "" -#: ../rpm.c:1263 +#: ../rpm.c:1271 msgid "no packages given for uninstall" msgstr "" -#: ../rpm.c:1303 +#: ../rpm.c:1311 msgid "no packages given for install" msgstr "" -#: ../rpm.c:1327 +#: ../rpm.c:1335 msgid "extra arguments given for query of all packages" msgstr "" -#: ../rpm.c:1332 +#: ../rpm.c:1340 msgid "no arguments given for query" msgstr "" -#: ../rpm.c:1349 +#: ../rpm.c:1357 msgid "no arguments given for verify" msgstr "" @@ -2595,83 +2595,83 @@ msgstr "" msgid "cannot read header at %d for lookup" msgstr "" -#: ../lib/macro.c:113 +#: ../lib/macro.c:114 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: ../lib/macro.c:200 +#: ../lib/macro.c:201 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: ../lib/macro.c:235 +#: ../lib/macro.c:236 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: ../lib/macro.c:408 +#: ../lib/macro.c:409 msgid "Macro %%%s has unterminated body" msgstr "" -#: ../lib/macro.c:434 +#: ../lib/macro.c:435 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: ../lib/macro.c:440 +#: ../lib/macro.c:441 msgid "Macro %%%s has unterminated opts" msgstr "" -#: ../lib/macro.c:445 +#: ../lib/macro.c:446 msgid "Macro %%%s has empty body" msgstr "" -#: ../lib/macro.c:450 +#: ../lib/macro.c:451 msgid "Macro %%%s failed to expand" msgstr "" -#: ../lib/macro.c:475 +#: ../lib/macro.c:476 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: ../lib/macro.c:548 +#: ../lib/macro.c:549 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: ../lib/macro.c:630 +#: ../lib/macro.c:631 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: ../lib/macro.c:792 +#: ../lib/macro.c:793 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: ../lib/macro.c:848 ../lib/macro.c:864 +#: ../lib/macro.c:849 ../lib/macro.c:865 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: ../lib/macro.c:893 +#: ../lib/macro.c:894 msgid "Empty token" msgstr "" -#: ../lib/macro.c:1015 +#: ../lib/macro.c:1016 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: ../lib/macro.c:1087 +#: ../lib/macro.c:1088 msgid "Target buffer overflow" msgstr "" -#: ../lib/macro.c:1201 ../lib/macro.c:1209 +#: ../lib/macro.c:1206 ../lib/macro.c:1214 #, c-format msgid "File %s: %s" msgstr "" -#: ../lib/macro.c:1212 +#: ../lib/macro.c:1217 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" @@ -2879,92 +2879,92 @@ msgstr "" msgid "read failed: %s (%d)" msgstr "" -#: ../lib/rpmrc.c:211 +#: ../lib/rpmrc.c:216 #, c-format msgid "missing second ':' at %s:%d" msgstr "" -#: ../lib/rpmrc.c:214 +#: ../lib/rpmrc.c:219 #, c-format msgid "missing architecture name at %s:%d" msgstr "" -#: ../lib/rpmrc.c:359 +#: ../lib/rpmrc.c:364 #, c-format msgid "Incomplete data line at %s:%d" msgstr "" -#: ../lib/rpmrc.c:363 +#: ../lib/rpmrc.c:368 #, c-format msgid "Too many args in data line at %s:%d" msgstr "" -#: ../lib/rpmrc.c:370 +#: ../lib/rpmrc.c:375 #, c-format msgid "Bad arch/os number: %s (%s:%d)" msgstr "" -#: ../lib/rpmrc.c:403 +#: ../lib/rpmrc.c:408 #, c-format msgid "Incomplete default line at %s:%d" msgstr "" -#: ../lib/rpmrc.c:408 +#: ../lib/rpmrc.c:413 #, c-format msgid "Too many args in default line at %s:%d" msgstr "" -#: ../lib/rpmrc.c:542 ../lib/rpmrc.c:558 +#: ../lib/rpmrc.c:547 ../lib/rpmrc.c:563 #, c-format msgid "Unable to open %s for reading: %s." msgstr "" -#: ../lib/rpmrc.c:602 +#: ../lib/rpmrc.c:610 #, c-format msgid "Failed to read %s: %s." msgstr "" -#: ../lib/rpmrc.c:633 +#: ../lib/rpmrc.c:641 #, c-format msgid "missing ':' at %s:%d" msgstr "" -#: ../lib/rpmrc.c:649 ../lib/rpmrc.c:744 +#: ../lib/rpmrc.c:657 ../lib/rpmrc.c:752 #, c-format msgid "missing argument for %s at %s:%d" msgstr "" -#: ../lib/rpmrc.c:679 +#: ../lib/rpmrc.c:687 #, c-format msgid "no macroname for setenv %s:%d" msgstr "" -#: ../lib/rpmrc.c:710 +#: ../lib/rpmrc.c:718 #, c-format msgid "expansion failed at %s:d \"%s\"" msgstr "" -#: ../lib/rpmrc.c:716 +#: ../lib/rpmrc.c:724 #, c-format msgid "cannot open %s at %s:%d" msgstr "" -#: ../lib/rpmrc.c:734 +#: ../lib/rpmrc.c:742 #, c-format msgid "missing architecture for %s at %s:%d" msgstr "" -#: ../lib/rpmrc.c:801 +#: ../lib/rpmrc.c:809 #, c-format msgid "bad option '%s' at %s:%d" msgstr "" -#: ../lib/rpmrc.c:1166 +#: ../lib/rpmrc.c:1174 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: ../lib/rpmrc.c:1167 +#: ../lib/rpmrc.c:1175 msgid "Please contact rpm-list@redhat.com\n" msgstr "" diff --git a/popt/config.h.in b/popt/config.h.in index e5af0d4..21a4244 100644 --- a/popt/config.h.in +++ b/popt/config.h.in @@ -1,19 +1,5 @@ /* config.h.in. Generated automatically from configure.in by autoheader. */ -/* Avoid autoheader noise */ -#ifndef PACKAGE -#undef PACKAGE -#endif -#ifndef VERSION -#undef VERSION -#endif -#ifndef PROTOTYPES -#undef PROTOTYPES -#endif -#ifndef _GNU_SOURCE -#undef _GNU_SOURCE -#endif - /* Define if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/rpmio/macro.c b/rpmio/macro.c index aa4aa4c..c8441eb 100644 --- a/rpmio/macro.c +++ b/rpmio/macro.c @@ -32,7 +32,8 @@ typedef struct MacroBuf { static int expandMacro(MacroBuf *mb); -int max_macro_depth = 2; +#define MAX_MACRO_DEPTH 5 +int max_macro_depth = MAX_MACRO_DEPTH; #ifdef DEBUG_MACROS int print_macro_trace = 0; @@ -1132,7 +1133,7 @@ initMacros(MacroContext *mc, const char *macrofile) if (first) { mc->macroTable = NULL; expandMacroTable(mc); - max_macro_depth = 2; /* XXX Assume good ol' macro expansion */ + max_macro_depth = MAX_MACRO_DEPTH; /* XXX Assume good ol' macro expansion */ first = 0; } diff --git a/scripts/Makefile.in b/scripts/Makefile.in index e5fccc9..ae416f4 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -69,6 +69,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ +FINDPROVIDES = @FINDPROVIDES@ +FINDREQUIRES = @FINDREQUIRES@ FIXPERMS = @FIXPERMS@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ @@ -86,8 +88,11 @@ LDFLAGS_STATIC = @LDFLAGS_STATIC@ LIBDL = @LIBDL@ LIBMISC = @LIBMISC@ LIBOBJS = @LIBOBJS@ +LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@ +LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@ LIBS = @LIBS@ LN_S = @LN_S@ +MACROFILES = @MACROFILES@ MAKEINFO = @MAKEINFO@ MISCDIR = @MISCDIR@ MISCPATH = @MISCPATH@ @@ -108,6 +113,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ l = @l@ +testdir = @testdir@ tmpdir = @tmpdir@ varprefix = @varprefix@ diff --git a/tests/Makefile.am b/tests/Makefile.am index aed05ff..28bf210 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,12 @@ ## Process this file with automake to produce Makefile.in. EXTRA_DIST = -SUBDIRS = if-test +SUBDIRS = hello-test +check-recursive: ./usr/ ./bin ./var + +./usr ./bin ./var: ../rpm + make -C .. DESTDIR=`pwd` install + +clean-local: + rm -rf ./usr ./bin ./var diff --git a/tests/Makefile.in b/tests/Makefile.in new file mode 100644 index 0000000..b66a464 --- /dev/null +++ b/tests/Makefile.in @@ -0,0 +1,311 @@ +# Makefile.in generated automatically by automake 1.3 from Makefile.am + +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SHELL = /bin/sh + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include + +DISTDIR = + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = .. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AR = @AR@ +AWK = @AWK@ +BZIP2BIN = @BZIP2BIN@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CPP = @CPP@ +DATADIRNAME = @DATADIRNAME@ +FINDPROVIDES = @FINDPROVIDES@ +FINDREQUIRES = @FINDREQUIRES@ +FIXPERMS = @FIXPERMS@ +GENCAT = @GENCAT@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GT_NO = @GT_NO@ +GT_YES = @GT_YES@ +GZIPBIN = @GZIPBIN@ +INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ +INCPATH = @INCPATH@ +INSTOBJEXT = @INSTOBJEXT@ +INTLDEPS = @INTLDEPS@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +LDFLAGS_STATIC = @LDFLAGS_STATIC@ +LIBDL = @LIBDL@ +LIBMISC = @LIBMISC@ +LIBOBJS = @LIBOBJS@ +LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@ +LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@ +LIBS = @LIBS@ +LN_S = @LN_S@ +MACROFILES = @MACROFILES@ +MAKEINFO = @MAKEINFO@ +MISCDIR = @MISCDIR@ +MISCPATH = @MISCPATH@ +MKDIR = @MKDIR@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +PACKAGE = @PACKAGE@ +POFILES = @POFILES@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +ROOT_GROUP = @ROOT_GROUP@ +RPM = @RPM@ +RPMCONFIGDIR = @RPMCONFIGDIR@ +TARGET = @TARGET@ +U = @U@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +l = @l@ +testdir = @testdir@ +tmpdir = @tmpdir@ +varprefix = @varprefix@ + +EXTRA_DIST = +SUBDIRS = hello-test +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../config.h +CONFIG_CLEAN_FILES = rpmrc +DIST_COMMON = Makefile.am Makefile.in rpmrc.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = tar +GZIP = --best +all: all-recursive all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +rpmrc: $(top_builddir)/config.status rpmrc.in + cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. + +@SET_MAKE@ + +all-recursive install-data-recursive install-exec-recursive \ +installdirs-recursive install-recursive uninstall-recursive \ +check-recursive installcheck-recursive info-recursive dvi-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + target=`echo $@ | sed s/-recursive//`; \ + echo "Making $$target in $$subdir"; \ + (cd $$subdir && $(MAKE) $$target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + done; \ + for subdir in $$rev; do \ + target=`echo $@ | sed s/-recursive//`; \ + echo "Making $$target in $$subdir"; \ + (cd $$subdir && $(MAKE) $$target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + (cd $$subdir && $(MAKE) tags); \ + done + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + done; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = tests + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu tests/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ + done + for subdir in $(SUBDIRS); do \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + done +info: info-recursive +dvi: dvi-recursive +check: all-am + $(MAKE) check-recursive +installcheck: installcheck-recursive +all-am: Makefile + +install-exec: install-exec-recursive + @$(NORMAL_INSTALL) + +install-data: install-data-recursive + @$(NORMAL_INSTALL) + +install: install-recursive + @: + +uninstall: uninstall-recursive + +install-strip: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install +installdirs: installdirs-recursive + + +mostlyclean-generic: + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +mostlyclean-am: mostlyclean-tags mostlyclean-generic + +clean-am: clean-tags clean-generic mostlyclean-am + +distclean-am: distclean-tags distclean-generic clean-am + +maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ + distclean-am + +mostlyclean: mostlyclean-recursive mostlyclean-am + +clean: clean-recursive clean-am clean-local + +distclean: distclean-recursive distclean-am + -rm -f config.status + +maintainer-clean: maintainer-clean-recursive maintainer-clean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +.PHONY: install-data-recursive uninstall-data-recursive \ +install-exec-recursive uninstall-exec-recursive installdirs-recursive \ +uninstalldirs-recursive all-recursive check-recursive \ +installcheck-recursive info-recursive dvi-recursive \ +mostlyclean-recursive distclean-recursive clean-recursive \ +maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ +distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ +installcheck all-am install-exec install-data install uninstall all \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +check-recursive: ./usr/ ./bin ./var + +./usr ./bin ./var: ../rpm + make -C .. DESTDIR=`pwd` install + +clean-local: + rm -rf ./usr ./bin ./var + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/tests/hello-test/Makefile.am b/tests/hello-test/Makefile.am new file mode 100644 index 0000000..e84ae5f --- /dev/null +++ b/tests/hello-test/Makefile.am @@ -0,0 +1,9 @@ +## Process this file with automake to produce Makefile.in. + +all: + +noinst_SCRIPTS = test0 + +TESTS_ENVIRONMENT = rpm="${top_builddir}/rpm --rcfile ${top_builddir}/tests/rpmrc" + +TESTS = test0 diff --git a/tests/hello-test/Makefile.in b/tests/hello-test/Makefile.in new file mode 100644 index 0000000..03ddf3a --- /dev/null +++ b/tests/hello-test/Makefile.in @@ -0,0 +1,246 @@ +# Makefile.in generated automatically by automake 1.3 from Makefile.am + +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SHELL = /bin/sh + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include + +DISTDIR = + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = ../.. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AR = @AR@ +AWK = @AWK@ +BZIP2BIN = @BZIP2BIN@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CPP = @CPP@ +DATADIRNAME = @DATADIRNAME@ +FINDPROVIDES = @FINDPROVIDES@ +FINDREQUIRES = @FINDREQUIRES@ +FIXPERMS = @FIXPERMS@ +GENCAT = @GENCAT@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GT_NO = @GT_NO@ +GT_YES = @GT_YES@ +GZIPBIN = @GZIPBIN@ +INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ +INCPATH = @INCPATH@ +INSTOBJEXT = @INSTOBJEXT@ +INTLDEPS = @INTLDEPS@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +LDFLAGS_STATIC = @LDFLAGS_STATIC@ +LIBDL = @LIBDL@ +LIBMISC = @LIBMISC@ +LIBOBJS = @LIBOBJS@ +LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@ +LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@ +LIBS = @LIBS@ +LN_S = @LN_S@ +MACROFILES = @MACROFILES@ +MAKEINFO = @MAKEINFO@ +MISCDIR = @MISCDIR@ +MISCPATH = @MISCPATH@ +MKDIR = @MKDIR@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +PACKAGE = @PACKAGE@ +POFILES = @POFILES@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +ROOT_GROUP = @ROOT_GROUP@ +RPM = @RPM@ +RPMCONFIGDIR = @RPMCONFIGDIR@ +TARGET = @TARGET@ +U = @U@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +l = @l@ +testdir = @testdir@ +tmpdir = @tmpdir@ +varprefix = @varprefix@ + +noinst_SCRIPTS = test0 + +TESTS_ENVIRONMENT = rpm="${top_builddir}/rpm --rcfile ${top_builddir}/tests/rpmrc" + +TESTS = test0 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../../config.h +CONFIG_CLEAN_FILES = +SCRIPTS = $(noinst_SCRIPTS) + +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = tar +GZIP = --best +all: Makefile $(SCRIPTS) + +.SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/hello-test/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +tags: TAGS +TAGS: + + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = tests/hello-test + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu tests/hello-test/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ + done +check-TESTS: $(TESTS) + @failed=0; all=0; \ + srcdir=$(srcdir); export srcdir; \ + for tst in $(TESTS); do \ + if test -f $$tst; then dir=.; \ + else dir="$(srcdir)"; fi; \ + if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \ + all=`expr $$all + 1`; \ + echo "PASS: $$tst"; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + banner="All $$all tests passed"; \ + else \ + banner="$$failed of $$all tests failed"; \ + fi; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0 +info: +dvi: +check: all + $(MAKE) check-TESTS +installcheck: +install-exec: + @$(NORMAL_INSTALL) + +install-data: + @$(NORMAL_INSTALL) + +install: install-exec install-data all + @: + +uninstall: + +install-strip: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install +installdirs: + + +mostlyclean-generic: + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +mostlyclean: mostlyclean-generic + +clean: clean-generic mostlyclean + +distclean: distclean-generic clean + -rm -f config.status + +maintainer-clean: maintainer-clean-generic distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +.PHONY: tags distdir check-TESTS info dvi installcheck install-exec \ +install-data install uninstall all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean + + +all: + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/tests/hello-test/hello-1.0.tar.gz b/tests/hello-test/hello-1.0.tar.gz new file mode 100644 index 0000000..7000ed3 Binary files /dev/null and b/tests/hello-test/hello-1.0.tar.gz differ diff --git a/tests/hello-test/hello-1.0/Makefile b/tests/hello-test/hello-1.0/Makefile new file mode 100644 index 0000000..43231fe --- /dev/null +++ b/tests/hello-test/hello-1.0/Makefile @@ -0,0 +1,8 @@ +all: hello + +install: + install -m 0755 hello $(DESTDIR)/usr/local/bin + +clean: + rm -f *.o hello + diff --git a/tests/hello-test/hello-1.0/README b/tests/hello-test/hello-1.0/README new file mode 100644 index 0000000..cfcfc7f --- /dev/null +++ b/tests/hello-test/hello-1.0/README @@ -0,0 +1 @@ +This is the README file for hello-1.0. diff --git a/tests/hello-test/hello-1.0/hello.c b/tests/hello-test/hello-1.0/hello.c new file mode 100644 index 0000000..1ee4843 --- /dev/null +++ b/tests/hello-test/hello-1.0/hello.c @@ -0,0 +1,5 @@ +int +main() +{ + printf("hello\n"); +} diff --git a/tests/hello-test/hello-1.0/hello.spec b/tests/hello-test/hello-1.0/hello.spec new file mode 100644 index 0000000..d33216b --- /dev/null +++ b/tests/hello-test/hello-1.0/hello.spec @@ -0,0 +1,29 @@ +Summary: hello -- hello, world rpm +Name: hello +Version: 1.0 +Release: 1 +Group: Utilities +License: GPL +Source0: hello-1.0.tar.gz +BuildRoot: /var/tmp/hello-root + +%description +Simple rpm demonstration. + +%prep +%setup -q + +%build +make + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/usr/local/bin +make DESTDIR=$RPM_BUILD_ROOT install + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +/usr/local/bin/hello diff --git a/tests/hello-test/test0 b/tests/hello-test/test0 new file mode 100755 index 0000000..83ba27d --- /dev/null +++ b/tests/hello-test/test0 @@ -0,0 +1,18 @@ +#!/bin/sh + +DBG=echo + +rpm=${rpm:=rpm} +destdir="`pwd`" +destdir="`dirname $destdir`" + +${DBGX} $rpm --initdb +${DBGX} $rpm --showrc + +#${DBGX} $rpm -ta hello-1.0-tar.gz + +cp hello-1.0.tar.gz ../usr/src/redhat/SOURCES +zcat hello-1.0.tar.gz | tar xOf - \*.spec > ../usr/src/redhat/SPECS/hello.spec +${DBGX} $rpm -ba ../usr/src/redhat/SPECS/hello.spec 2>&1 | sed -e "s,$destdir,," > test0.out + +exit 0 diff --git a/tests/hello-test/test0.exp b/tests/hello-test/test0.exp new file mode 100644 index 0000000..f2d2015 --- /dev/null +++ b/tests/hello-test/test0.exp @@ -0,0 +1,44 @@ +Executing: %prep ++ umask 022 ++ cd /usr/src/redhat/BUILD ++ cd /usr/src/redhat/BUILD ++ rm -rf hello-1.0 ++ /bin/gzip -dc /usr/src/redhat/SOURCES/hello-1.0.tar.gz ++ tar -xf - ++ STATUS=0 ++ [ 0 -ne 0 ] ++ cd hello-1.0 ++ chmod -R a+rX,g-w,o-w . ++ exit 0 +Executing: %build ++ umask 022 ++ cd /usr/src/redhat/BUILD ++ cd hello-1.0 ++ make +make[2]: Entering directory `/usr/src/redhat/BUILD/hello-1.0' +make[2]: Nothing to be done for `all'. +make[2]: Leaving directory `/usr/src/redhat/BUILD/hello-1.0' ++ exit 0 +Executing: %install ++ umask 022 ++ cd /usr/src/redhat/BUILD ++ cd hello-1.0 ++ rm -rf /var/tmp/hello-root ++ mkdir -p /var/tmp/hello-root/usr/local/bin ++ make DESTDIR=/var/tmp/hello-root install +make[2]: Entering directory `/usr/src/redhat/BUILD/hello-1.0' +install -m 0755 hello /var/tmp/hello-root/usr/local/bin +make[2]: Leaving directory `/usr/src/redhat/BUILD/hello-1.0' ++ exit 0 +Processing files: hello +Finding provides... +Finding requires... +Requires: ld-linux.so.2 libc.so.6 +Wrote: /usr/src/redhat/SRPMS/hello-1.0-1.src.rpm +Wrote: /usr/src/redhat/RPMS/sparc/hello-1.0-1.sparc.rpm +Executing: %clean ++ umask 022 ++ cd /usr/src/redhat/BUILD ++ cd hello-1.0 ++ rm -rf /var/tmp/hello-root ++ exit 0 diff --git a/tests/rpmrc.in b/tests/rpmrc.in new file mode 100644 index 0000000..041ab56 --- /dev/null +++ b/tests/rpmrc.in @@ -0,0 +1,198 @@ +############################################################# +# Default values, often overridden in /etc/rpmrc +# +# This file *should not be modified*. Local customizations +# belong in /etc/rpmrc, not here. This file will be replaced +# whenever a new version of RPM is installed. + +macrofiles: @testdir@@MACROFILES@ +dbpath: @testdir@@varprefix@/lib/rpm +topdir: @testdir@@prefix@/src/redhat +tmppath: @testdir@@tmpdir@ +gzipbin: @testdir@@GZIPBIN@ +bzip2bin: @testdir@@BZIP2BIN@ +defaultdocdir: @testdir@@prefix@/doc +fixperms: @FIXPERMS@ +rpmfilename: %{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm +instchangelog: 5 + +############################################################# + +# Please send new entries to rpm-list@redhat.com + +############################################################# +# Values for RPM_OPT_FLAGS for various platforms + +optflags: i386 -O2 -m486 -fno-strength-reduce +optflags: alpha -O2 +optflags: sparc -O2 +optflags: m68k -O2 -fomit-frame-pointer +optflags: ppc -O2 -fsigned-char +optflags: parisc -O2 -mpa-risc-1-0 +optflags: hppa1.0 -O2 -mpa-risc-1-0 +optflags: hppa1.1 -O2 -mpa-risc-1-0 +optflags: hppa1.2 -O2 -mpa-risc-1-0 +optflags: hppa2.0 -O2 -mpa-risc-1-0 +optflags: mipseb -O2 +optflags: mipsel -O2 +optflags: arm3 -O2 +optflags: arm4 -O2 + +############################################################# +# Canonical arch names and numbers + +arch_canon: i986: i986 1 +arch_canon: i886: i886 1 +arch_canon: i786: i786 1 +arch_canon: i686: i686 1 +arch_canon: i586: i586 1 +arch_canon: i486: i486 1 +arch_canon: i386: i386 1 +arch_canon: alpha: alpha 2 +arch_canon: sparc: sparc 3 +arch_canon: sun4: sparc 3 +arch_canon: sun4m: sparc 3 +arch_canon: sun4c: sparc 3 +arch_canon: sun4d: sparc 3 +# This is really a place holder for MIPS. +arch_canon: mipseb: mipseb 4 +arch_canon: ppc: ppc 5 +arch_canon: m68k: m68k 6 +arch_canon: IP: sgi 7 +arch_canon: rs6000: rs6000 8 + +arch_canon: sun4u: usparc 10 +arch_canon: mipsel: mipsel 11 + +arch_canon: arm: arm 12 +arch_canon: arm6: arm3 12 +arch_canon: arm610: arm3 12 +arch_canon: arm7: arm3 12 +arch_canon: arm710: arm3 12 +arch_canon: arm8: arm4 12 +arch_canon: arm810: arm4 12 +arch_canon: sa110: arm4 12 + +############################################################# +# Canonical OS names and numbers + +os_canon: Linux: Linux 1 +os_canon: IRIX: Irix 2 +# This is wrong +os_canon: SunOS5: solaris 3 +os_canon: SunOS4: SunOS 4 + +os_canon: AmigaOS: AmigaOS 5 +os_canon: AIX: AIX 5 +os_canon: HP-UX: hpux10 6 +os_canon: OSF1: osf1 7 +os_canon: FreeBSD: FreeBSD 8 +os_canon: SCO_SV: SCO_SV3.2v5.0.2 9 +os_canon: IRIX64: Irix64 10 +os_canon: NEXTSTEP: NextStep 11 +os_canon: BSD/OS: BSD_OS 12 +os_canon: machten: machten 13 +os_canon: CYGWIN32_NT: cygwin32 14 +os_canon: CYGWIN32_95: cygwin32 15 +os_canon: UNIX_SV: MP_RAS: 16 + +############################################################# +# For a given uname().machine, the default build arch + +buildarchtranslate: osfmach3_i986: i386 +buildarchtranslate: osfmach3_i886: i386 +buildarchtranslate: osfmach3_i786: i386 +buildarchtranslate: osfmach3_i686: i386 +buildarchtranslate: osfmach3_i586: i386 +buildarchtranslate: osfmach3_i486: i386 +buildarchtranslate: osfmach3_i386: i386 + +buildarchtranslate: i986: i386 +buildarchtranslate: i886: i386 +buildarchtranslate: i786: i386 +buildarchtranslate: i686: i386 +buildarchtranslate: i586: i386 +buildarchtranslate: i486: i386 +buildarchtranslate: i386: i386 + +buildarchtranslate: osfmach3_ppc: ppc +buildarchtranslate: powerpc: ppc +buildarchtranslate: powerppc: ppc + +############################################################# +# Architecture compatibility + +arch_compat: alpha: axp noarch + +arch_compat: i986: i886 +arch_compat: i886: i786 +arch_compat: i786: i686 +arch_compat: i686: i586 +arch_compat: i586: i486 +arch_compat: i486: i386 +arch_compat: i386: noarch + +arch_compat: osfmach3_i986: i986 osfmach3_i886 +arch_compat: osfmach3_i886: i886 osfmach3_i786 +arch_compat: osfmach3_i786: i786 osfmach3_i686 +arch_compat: osfmach3_i686: i686 osfmach3_i586 +arch_compat: osfmach3_i586: i586 osfmach3_i486 +arch_compat: osfmach3_i486: i486 osfmach3_i386 +arch_compat: osfmach3_i386: i486 + +arch_compat: osfmach3_ppc: ppc +arch_compat: powerpc: ppc +arch_compat: powerppc: ppc + +arch_compat: usparc: sparc +arch_compat: sparc: noarch + +arch_compat: ppc: rs6000 +arch_compat: rs6000: noarch +arch_compat: mipseb: noarch +arch_compat: mipsel: noarch + +arch_compat: hppa2.0: hppa1.2 +arch_compat: hppa1.2: hppa1.1 +arch_compat: hppa1.1: hppa1.0 +arch_compat: hppa1.0: parisc +arch_compat: parisc: noarch + +arch_compat: arm4: arm3 +arch_compat: arm3: noarch + +os_compat: IRIX64: IRIX +os_compat: solaris2.6: solaris2.3 solaris2.4 solaris2.5 +os_compat: solaris2.5: solaris2.3 solaris2.4 +os_compat: solaris2.4: solaris2.3 + +os_compat: hpux11.00: hpux10.30 +os_compat: hpux10.30: hpux10.20 +os_compat: hpux10.20: hpux10.10 +os_compat: hpux10.10: hpux10.01 +os_compat: hpux10.01: hpux10.00 +os_compat: hpux10.00: hpux9.07 +os_compat: hpux9.07: hpux9.05 +os_compat: hpux9.05: hpux9.04 + +os_compat: osf4.0: osf3.2 + +os_compat: ncr-sysv4.3: ncr-sysv4.2 + +buildarch_compat: i986: i886 +buildarch_compat: i886: i786 +buildarch_compat: i786: i686 +buildarch_compat: i686: i586 +buildarch_compat: i586: i486 +buildarch_compat: i486: i386 +buildarch_compat: i386: noarch + +buildarch_compat: sparc: noarch +buildarch_compat: alpha: noarch +buildarch_compat: m68k: noarch +buildarch_compat: ppc: noarch +buildarch_compat: mipsel: noarch +buildarch_compat: mipseb: noarch +buildarch_compat: arm4: noarch +buildarch_compat: arm3: noarch +buildarch_compat: parisc: noarch diff --git a/tools/Makefile.in b/tools/Makefile.in index aad4eac..010c826 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -69,6 +69,8 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ +FINDPROVIDES = @FINDPROVIDES@ +FINDREQUIRES = @FINDREQUIRES@ FIXPERMS = @FIXPERMS@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ @@ -86,8 +88,11 @@ LDFLAGS_STATIC = @LDFLAGS_STATIC@ LIBDL = @LIBDL@ LIBMISC = @LIBMISC@ LIBOBJS = @LIBOBJS@ +LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@ +LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@ LIBS = @LIBS@ LN_S = @LN_S@ +MACROFILES = @MACROFILES@ MAKEINFO = @MAKEINFO@ MISCDIR = @MISCDIR@ MISCPATH = @MISCPATH@ @@ -108,6 +113,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ l = @l@ +testdir = @testdir@ tmpdir = @tmpdir@ varprefix = @varprefix@