Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/make/patches/Makefile.patch
author Shawn Ferry <shawn.ferry@oracle.com>
Wed, 30 Mar 2016 12:56:49 -0400
changeset 5747 4441137c3e4a
parent 5074 24b9f318a3b0
permissions -rw-r--r--
22853886 ruby/gem specs and tests should be faceted out via default transforms
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5074
24b9f318a3b0 22137282 upgrade gnu make to 4.1
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 4341
diff changeset 
     1
 
--- make-4.1.orig/Makefile.in	Sun Oct  5 09:25:22 2014
24b9f318a3b0 22137282 upgrade gnu make to 4.1
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 4341
diff changeset 
     2
 
+++ make-4.1/Makefile.in	Sat Oct 31 13:56:50 2015
24b9f318a3b0 22137282 upgrade gnu make to 4.1
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 4341
diff changeset 
     3
 
@@ -1265,6 +1265,26 @@
4341
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     4
 
 	  echo "Can't find the GNU Make test suite ($(srcdir)/tests)."; \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     5
 
 	 fi
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     6
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     7
 
+system-test:
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     8
 
+	@if test -f "$(srcdir)/tests/run_make_tests"; then \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     9
 
+	  if $(PERL) -v >/dev/null 2>&1; then \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    10
 
+	    case `cd $(srcdir); pwd` in `pwd`) : ;; \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    11
 
+	      *) test -d tests || mkdir tests; \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    12
 
+		 rm -f srctests; \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    13
 
+		 if ln -s "$(srcdir)/tests" srctests; then \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    14
 
+		   for f in run_make_tests run_make_tests.pl test_driver.pl scripts; do \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    15
 
+		     rm -f tests/$$f; ln -s ../srctests/$$f tests; \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    16
 
+		   done; fi ;; \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    17
 
+	    esac; \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    18
 
+	    echo "cd tests && $(PERL) ./run_make_tests.pl -make /usr/bin/gmake $(MAKETESTFLAGS)"; \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    19
 
+	    cd tests && $(PERL) ./run_make_tests.pl -make /usr/bin/gmake $(MAKETESTFLAGS); \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    20
 
+	  else \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    21
 
+	    echo "Can't find a working Perl ($(PERL)); the test suite requires Perl."; \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    22
 
+	  fi; \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    23
 
+	 else \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    24
 
+	  echo "Can't find the GNU Make test suite ($(srcdir)/tests)."; \
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    25
 
+	 fi
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    26
 
+
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    27
 
 # --------------- Maintainer's Section
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    28
10335b2a1e5d 21131319 a few more things could have system-test targets
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    29
 
 # Tell automake that I haven't forgotten about this file and it will be
upstream/oracle/userland-gate