diff options
author | Michael E Brown <michael_e_brown@dell.com> | 2007-12-10 14:15:28 -0600 |
---|---|---|
committer | Michael E Brown <michael_e_brown@dell.com> | 2007-12-10 14:15:28 -0600 |
commit | 4ebeda2c46e91902210988e158ff08b6e6b25365 (patch) | |
tree | 8e3d3106ada489c1acea8eb7159d5a2ada7632d0 | |
parent | d91271d37a6155fd45f82f2d4c7289acbef0674b (diff) | |
download | mock-4ebeda2c46e91902210988e158ff08b6e6b25365.tar.gz mock-4ebeda2c46e91902210988e158ff08b6e6b25365.tar.xz mock-4ebeda2c46e91902210988e158ff08b6e6b25365.zip |
move daemontest.c back into docs/ so mock 0.8 and mock 0.9 can share unit test code.
-rw-r--r-- | Makefile.am | 1 | ||||
-rw-r--r-- | Makefile.in | 54 | ||||
-rw-r--r-- | docs/daemontest.c (renamed from src/daemontest.c) | 0 | ||||
-rwxr-xr-x | docs/releasetests.sh | 4 |
4 files changed, 19 insertions, 40 deletions
diff --git a/Makefile.am b/Makefile.am index 024f221..ec082a4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,6 @@ DISTCLEANFILES=*~ EXTRA_DIST = bin_PROGRAMS= -check_PROGRAMS= src/daemontest CLEANFILES += $(EXTRA_PROGRAMS) diff --git a/Makefile.in b/Makefile.in index 42dcc6b..67d4a35 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,7 +37,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = src/mock$(EXEEXT) -check_PROGRAMS = src/daemontest$(EXEEXT) subdir = . DIST_COMMON = README $(am__configure_deps) $(dist_libexec_SCRIPTS) \ $(dist_mocketc_DATA) $(pkgpython_PYTHON) $(plugins_PYTHON) \ @@ -62,10 +61,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \ "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(mocketcdir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -src_daemontest_SOURCES = src/daemontest.c am__dirstamp = $(am__leading_dot)dirstamp -src_daemontest_OBJECTS = src/daemontest.$(OBJEXT) -src_daemontest_LDADD = $(LDADD) am_src_mock_OBJECTS = src/mock.$(OBJEXT) src_mock_OBJECTS = $(am_src_mock_OBJECTS) src_mock_LDADD = $(LDADD) @@ -86,8 +82,8 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = src/daemontest.c $(src_mock_SOURCES) -DIST_SOURCES = src/daemontest.c $(src_mock_SOURCES) +SOURCES = $(src_mock_SOURCES) +DIST_SOURCES = $(src_mock_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -383,24 +379,12 @@ clean-binPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done src/$(am__dirstamp): @$(MKDIR_P) src @: > src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/$(DEPDIR) @: > src/$(DEPDIR)/$(am__dirstamp) -src/daemontest.$(OBJEXT): src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) -src/daemontest$(EXEEXT): $(src_daemontest_OBJECTS) $(src_daemontest_DEPENDENCIES) src/$(am__dirstamp) - @rm -f src/daemontest$(EXEEXT) - $(LINK) $(src_daemontest_OBJECTS) $(src_daemontest_LDADD) $(LIBS) src/mock.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/mock$(EXEEXT): $(src_mock_OBJECTS) $(src_mock_DEPENDENCIES) src/$(am__dirstamp) @rm -f src/mock$(EXEEXT) @@ -427,13 +411,11 @@ uninstall-dist_libexecSCRIPTS: mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f src/daemontest.$(OBJEXT) -rm -f src/mock.$(OBJEXT) distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/daemontest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mock.Po@am__quote@ .c.o: @@ -861,7 +843,6 @@ distcleancheck: distclean $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) check: check-recursive all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) installdirs: installdirs-recursive @@ -899,8 +880,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive -clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ - clean-libtool mostlyclean-am +clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -971,20 +951,20 @@ uninstall-man: uninstall-man1 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-binPROGRAMS \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ - dist-tarZ dist-zip distcheck distclean distclean-compile \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-dist_libexecSCRIPTS install-dist_mocketcDATA \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-exec-hook install-html install-html-am install-info \ - install-info-am install-man install-man1 install-pdf \ - install-pdf-am install-pkgpythonPYTHON install-pluginsPYTHON \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ + clean-generic clean-libtool ctags ctags-recursive dist \ + dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \ + distcheck distclean distclean-compile distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-binPROGRAMS install-data \ + install-data-am install-dist_libexecSCRIPTS \ + install-dist_mocketcDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-exec-hook install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am \ + install-pkgpythonPYTHON install-pluginsPYTHON install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am \ diff --git a/src/daemontest.c b/docs/daemontest.c index f0e7393..f0e7393 100644 --- a/src/daemontest.c +++ b/docs/daemontest.c diff --git a/docs/releasetests.sh b/docs/releasetests.sh index 78240d8..0d2caa5 100755 --- a/docs/releasetests.sh +++ b/docs/releasetests.sh @@ -26,7 +26,7 @@ make distclean ||: ./configure make distcheck make srpm -make src/daemontest +gcc -o docs/daemontest docs/daemontest.c # # most tests below will use this mock command line @@ -69,7 +69,7 @@ if pgrep daemontest; then exit 1 fi time $MOCKCMD --offline --init -cp src/daemontest $CHROOT/tmp +cp docs/daemontest $CHROOT/tmp time $MOCKCMD --offline --chroot -- /tmp/daemontest if pgrep daemontest; then echo "Daemontest FAILED. found a daemontest process running after exit." |