Changeset 48a8127 for src/tests

Timestamp:

Jun 21, 2016, 5:47:10 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

df42128

Parents:

122cac7 (diff), 6bc4734 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/tests

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (10 diffs)

src/tests/Makefile.am

@@ -19 +19 @@
 CC = @CFA_BINDIR@/cfa
 
-noinst_PROGRAMS = fstream_test vector_test avl_test # build but do not install
+.PHONY : list
+EXTRA_PROGRAMS = fstream_test vector_test avl_test Constant0-1DP Constant0-1ND Constant0-1NDDP # build but do not install
+
 fstream_test_SOURCES = fstream_test.c
 vector_test_SOURCES = vector/vector_int.c vector/array.c vector/vector_test.c
 avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
+
+all-local :
+        python test.py --all
+
+clean-local :
+        -rm -f ${EXTRA_PROGRAMS}
+
+list :
+        python test.py --list
 
 Constant0-1DP : Constant0-1.c

src/tests/Makefile.in

@@ -18 +18 @@
 ######################## -*- Mode: Makefile-Automake -*- ######################
 ###############################################################################
-
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -36 +35 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-noinst_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \
-        avl_test$(EXEEXT)
+EXTRA_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \
+        avl_test$(EXEEXT) Constant0-1DP$(EXEEXT) \
+        Constant0-1ND$(EXEEXT) Constant0-1NDDP$(EXEEXT)
 subdir = src/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -48 +48 @@
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
+Constant0_1DP_SOURCES = Constant0-1DP.c
+Constant0_1DP_OBJECTS = Constant0-1DP.$(OBJEXT)
+Constant0_1DP_LDADD = $(LDADD)
+Constant0_1ND_SOURCES = Constant0-1ND.c
+Constant0_1ND_OBJECTS = Constant0-1ND.$(OBJEXT)
+Constant0_1ND_LDADD = $(LDADD)
+Constant0_1NDDP_SOURCES = Constant0-1NDDP.c
+Constant0_1NDDP_OBJECTS = Constant0-1NDDP.$(OBJEXT)
+Constant0_1NDDP_LDADD = $(LDADD)
 am_avl_test_OBJECTS = avl_test.$(OBJEXT) avl0.$(OBJEXT) avl1.$(OBJEXT) \
         avl2.$(OBJEXT) avl3.$(OBJEXT) avl4.$(OBJEXT) \
@@ -84 +92 @@
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \
+SOURCES = Constant0-1DP.c Constant0-1ND.c Constant0-1NDDP.c \
+        $(avl_test_SOURCES) $(fstream_test_SOURCES) \
         $(vector_test_SOURCES)
-DIST_SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \
+DIST_SOURCES = Constant0-1DP.c Constant0-1ND.c Constant0-1NDDP.c \
+        $(avl_test_SOURCES) $(fstream_test_SOURCES) \
         $(vector_test_SOURCES)
 ETAGS = etags
@@ -235 +245 @@
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-
-clean-noinstPROGRAMS:
-        -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 avl_test$(EXEEXT): $(avl_test_OBJECTS) $(avl_test_DEPENDENCIES) $(EXTRA_avl_test_DEPENDENCIES) 
         @rm -f avl_test$(EXEEXT)
@@ -254 +261 @@
         -rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Constant0-1DP.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Constant0-1ND.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Constant0-1NDDP.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl-private.Po@am__quote@
@@ -504 +514 @@
 check-am: all-am
 check: check-am
-all-am: Makefile $(PROGRAMS)
+all-am: Makefile all-local
 installdirs:
 install: install-am
@@ -538 +548 @@
 clean: clean-am
 
-clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
+clean-am: clean-generic clean-local mostlyclean-am
 
 distclean: distclean-am
@@ -607 +617 @@
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-noinstPROGRAMS ctags distclean distclean-compile \
+.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
+        clean-generic clean-local ctags distclean distclean-compile \
         distclean-generic distclean-tags distdir dvi dvi-am html \
         html-am info info-am install install-am install-data \
@@ -621 +631 @@
 
 
+.PHONY : list
+
+all-local :
+        python test.py --all
+
+clean-local :
+        -rm -f ${EXTRA_PROGRAMS}
+
+list :
+        python test.py --list
+
 Constant0-1DP : Constant0-1.c
         ${CC} ${CFLAGS} -DDUPS ${<} -o ${@}