Changeset bac5158 for src/tests/preempt_longrun

Timestamp:

Jul 15, 2017, 9:47:54 AM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

478b1d0

Parents:

994d080 (diff), 6ea87486 (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:

fix conflict

Location:

src/tests/preempt_longrun

Files:

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

src/tests/preempt_longrun/Makefile.am

@@ -31 +31 @@
 all-local: ${TESTS:=.run}
 
+clean-local:
+        rm -f ${TESTS}
+
 % : %.c ${CC}
         ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}

src/tests/preempt_longrun/Makefile.in

@@ -790 +790 @@
 clean: clean-am
 
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-local mostlyclean-am
 
 distclean: distclean-am
@@ -857 +857 @@
 
 .PHONY: all all-am all-local check check-TESTS check-am clean \
-        clean-generic cscopelist-am ctags-am distclean \
+        clean-generic clean-local cscopelist-am ctags-am distclean \
         distclean-generic distdir dvi dvi-am html html-am info info-am \
         install install-am install-data install-data-am install-dvi \
@@ -875 +875 @@
 all-local: ${TESTS:=.run}
 
+clean-local:
+        rm -f ${TESTS}
+
 % : %.c ${CC}
         ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}