Compare commits
114 Commits
make-3_80-
...
rawhide
Author | SHA1 | Date | |
---|---|---|---|
|
bcee1864f4 | ||
|
7a05dfee17 | ||
|
b3884b6199 | ||
|
00a29b7cdd | ||
|
dc62df15c3 | ||
|
48f881d9ec | ||
|
ae5b60c6a1 | ||
|
34e875fab2 | ||
|
6925c68189 | ||
|
3e611c05a0 | ||
|
c55f31d05d | ||
|
efd32f8da0 | ||
|
0d6b893b6e | ||
|
56a9df0d91 | ||
|
4bec0ace93 | ||
|
b119ff1512 | ||
|
a58f35f819 | ||
|
7f806a278b | ||
|
0bdbc64c9d | ||
|
3c945c8317 | ||
|
de7f11af49 | ||
|
e5dfe9e074 | ||
|
36f155c8bb | ||
|
95ae6bbdd1 | ||
|
519a7c5bcb | ||
|
993b78d5a3 | ||
|
49f4723b0c | ||
|
c34a6d6d07 | ||
|
694b30dfe6 | ||
|
dae5f53f05 | ||
|
3ffc99baef | ||
|
9c4a278bbd | ||
|
f83aa1e94f | ||
|
539d55578b | ||
|
7a6a3abdcd | ||
|
ef864d2be6 | ||
|
966e01fab7 | ||
|
2bfdac0113 | ||
|
d6bbfbfe82 | ||
|
3fc63a36eb | ||
|
ec9e7e7c9c | ||
|
5fe9b3a45f | ||
|
2d4dfd6bee | ||
|
e5494879d5 | ||
|
97dd22fe6f | ||
|
4bdfdfc1de | ||
|
16e43594e4 | ||
|
bdf98ed389 | ||
|
ee7f908927 | ||
|
e62c874ba6 | ||
|
7b4e48e3b0 | ||
|
7cf149fc79 | ||
|
ba10d75822 | ||
|
201e8d2a73 | ||
|
c2611a71f6 | ||
|
aa3f81378c | ||
|
4cf7c2db3f | ||
|
a6daa69369 | ||
|
3c30cb13ff | ||
|
19e83e35df | ||
|
f922366e1d | ||
|
c662835b9a | ||
|
e8bdb89472 | ||
|
3fa94216f6 | ||
|
73b059a9b3 | ||
|
d15338db67 | ||
|
88ea1307f7 | ||
|
122b5f0711 | ||
|
2257aac321 | ||
|
f4292858b8 | ||
|
ccbdcb62ff | ||
|
49cf6ef2f1 | ||
|
4527792b27 | ||
|
f03de169f9 | ||
|
9f8da0d334 | ||
|
656d7d1eb5 | ||
|
8105161bd7 | ||
|
83d3b5a753 | ||
|
fd10e2cd33 | ||
|
26212b01e8 | ||
|
1be63b156a | ||
|
9c0942e9d9 | ||
|
1c7ca6c48f | ||
|
bed4db9ca3 | ||
|
f9dc59f27b | ||
|
7b15cec2a5 | ||
|
63abf036f3 | ||
|
9d4c9891e3 | ||
|
e801fa1472 | ||
|
eb9bbd322e | ||
|
5710b6e4bb | ||
|
5e5fa405a8 | ||
|
25d5acf904 | ||
|
d199711780 | ||
|
f5e8b6c324 | ||
|
9f841d9d76 | ||
|
6c7d4da4c2 | ||
|
1579d07b08 | ||
|
2268e42ed5 | ||
|
e74898ad5a | ||
|
7264eaac0b | ||
|
5b7218ccaa | ||
|
19962f8203 | ||
|
fd6e9c4268 | ||
|
2a3871a1b2 | ||
|
ff58089a52 | ||
|
0146d90ab4 | ||
|
6611600d86 | ||
|
af60a2920c | ||
|
3d5c4c0e4b | ||
|
f0a6742a14 | ||
|
3f950a330a | ||
|
8f54b1da71 | ||
|
31817bda26 |
@ -1 +0,0 @@
|
|||||||
make-3.80.tar.bz2
|
|
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
|||||||
|
1
|
8
.gitignore
vendored
Normal file
8
.gitignore
vendored
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
make-3.81.tar.bz2
|
||||||
|
/make-*/
|
||||||
|
make-3.82.tar.bz2
|
||||||
|
*.rpm
|
||||||
|
/make-4.0.tar.bz2
|
||||||
|
/make-4.1.tar.bz2
|
||||||
|
/make-4.2.1.tar.bz2
|
||||||
|
/make-4.3.tar.gz
|
6
Makefile
6
Makefile
@ -1,6 +0,0 @@
|
|||||||
# Makefile for source rpm: make
|
|
||||||
# $Id$
|
|
||||||
NAME := make
|
|
||||||
SPECFILE = $(firstword $(wildcard *.spec))
|
|
||||||
|
|
||||||
include ../common/Makefile.common
|
|
7
STAGE1-make
Normal file
7
STAGE1-make
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
srpm $1
|
||||||
|
mcd $BUILDDIR/$1
|
||||||
|
$SRC/${1}-*/configure $TCONFIGARGS
|
||||||
|
notparallel
|
||||||
|
test -d tools/gnulib/lib && make $J V=1 -C tools/gnulib/lib
|
||||||
|
make $J V=1
|
||||||
|
make $J install DESTDIR=${ROOTFS}
|
19
gating.yaml
Normal file
19
gating.yaml
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- fedora-*
|
||||||
|
decision_context: bodhi_update_push_stable
|
||||||
|
subject_type: koji_build
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-8
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-9
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
@ -1,22 +0,0 @@
|
|||||||
--- make-3.80/configure.in
|
|
||||||
+++ make-3.80/configure.in
|
|
||||||
@@ -91,7 +91,7 @@
|
|
||||||
if test "$make_cv_file_timestamp_hi_res" = yes; then
|
|
||||||
# Solaris 2.5.1 needs -lposix4 to get the clock_gettime function.
|
|
||||||
# Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4.
|
|
||||||
- AC_SEARCH_LIBS(clock_gettime, [rt posix4])
|
|
||||||
+ AC_SEARCH_LIBS(clock_gettime, [posix4])
|
|
||||||
if test "$ac_cv_search_clock_gettime" != no; then
|
|
||||||
AC_DEFINE(HAVE_CLOCK_GETTIME, 1,
|
|
||||||
[Define if you have the clock_gettime function.])
|
|
||||||
--- make-3.80/configure
|
|
||||||
+++ make-3.80/configure
|
|
||||||
@@ -6794,7 +6794,7 @@
|
|
||||||
fi
|
|
||||||
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
|
||||||
if test "$ac_cv_search_clock_gettime" = no; then
|
|
||||||
- for ac_lib in rt posix4; do
|
|
||||||
+ for ac_lib in posix4; do
|
|
||||||
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
#line $LINENO "configure"
|
|
@ -1,36 +0,0 @@
|
|||||||
--- make-3.79.1/configure.in.sopwith 2002-12-03 09:51:07.000000000 -0500
|
|
||||||
+++ make-3.79.1/configure.in 2002-12-03 09:51:07.000000000 -0500
|
|
||||||
@@ -32,7 +32,7 @@
|
|
||||||
AC_TYPE_PID_T
|
|
||||||
AC_TYPE_SIGNAL
|
|
||||||
AC_CHECK_HEADERS(stdlib.h unistd.h limits.h sys/param.h fcntl.h string.h \
|
|
||||||
- memory.h sys/time.h sys/timeb.h)
|
|
||||||
+ memory.h sys/time.h sys/timeb.h signal.h)
|
|
||||||
AC_PROG_CC_C_O
|
|
||||||
AM_PROG_CC_STDC
|
|
||||||
AC_C_CONST dnl getopt needs this.
|
|
||||||
@@ -144,7 +144,12 @@
|
|
||||||
fi
|
|
||||||
AC_MSG_RESULT($make_cv_union_wait)
|
|
||||||
|
|
||||||
-AC_DECL_SYS_SIGLIST
|
|
||||||
+ac_includes_default="$ac_includes_default
|
|
||||||
+#ifdef HAVE_SIGNAL_H
|
|
||||||
+#include <signal.h>
|
|
||||||
+#endif
|
|
||||||
+"
|
|
||||||
+AC_SYS_SIGLIST_DECLARED
|
|
||||||
|
|
||||||
# The presence of the following is not meant to imply
|
|
||||||
# that make necessarily works on those systems.
|
|
||||||
--- make-3.79.1/signame.c.sopwith 2002-12-03 09:53:15.000000000 -0500
|
|
||||||
+++ make-3.79.1/signame.c 2002-12-03 09:54:28.000000000 -0500
|
|
||||||
@@ -47,7 +47,7 @@
|
|
||||||
|
|
||||||
#else /* HAVE_SYS_SIGLIST. */
|
|
||||||
|
|
||||||
-#ifndef SYS_SIGLIST_DECLARED
|
|
||||||
+#if !defined(SYS_SIGLIST_DECLARED) && !defined(HAVE_DECL_SYS_SIGLIST)
|
|
||||||
extern char *sys_siglist[];
|
|
||||||
#endif /* Not SYS_SIGLIST_DECLARED. */
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
|||||||
--- make-3.80/make.h.jj 2002-09-11 12:55:44.000000000 -0400
|
|
||||||
+++ make-3.80/make.h 2005-03-07 09:24:53.000000000 -0500
|
|
||||||
@@ -474,7 +474,7 @@ extern long int lseek ();
|
|
||||||
#endif /* Not GNU C library or POSIX. */
|
|
||||||
|
|
||||||
#ifdef HAVE_GETCWD
|
|
||||||
-# if !defined(VMS) && !defined(__DECC)
|
|
||||||
+# if !defined(VMS) && !defined(__DECC) && !defined(getcwd)
|
|
||||||
extern char *getcwd ();
|
|
||||||
#endif
|
|
||||||
#else
|
|
@ -1,23 +0,0 @@
|
|||||||
--- make-3.80/main.c.jj 2002-08-09 21:27:17.000000000 -0400
|
|
||||||
+++ make-3.80/main.c 2004-12-13 12:48:25.000000000 -0500
|
|
||||||
@@ -1549,6 +1549,20 @@ int main (int argc, char ** argv)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef PIPE_BUF
|
|
||||||
+ if (job_slots > PIPE_BUF)
|
|
||||||
+#elif defined _POSIX_PIPE_BUF
|
|
||||||
+ if (job_slots > _POSIX_PIPE_BUF)
|
|
||||||
+#else
|
|
||||||
+ if (job_slots > 512)
|
|
||||||
+#endif
|
|
||||||
+ {
|
|
||||||
+ error (NILF,
|
|
||||||
+ _("More parallel jobs (-jN) than this platform can handle requested."));
|
|
||||||
+ error (NILF, _("Resetting to single job (-j1) mode."));
|
|
||||||
+ job_slots = 1;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/* If we have >1 slot but no jobserver-fds, then we're a top-level make.
|
|
||||||
Set up the pipe and install the fds option for our children. */
|
|
||||||
|
|
14
make-4.0-noclock_gettime.patch
Normal file
14
make-4.0-noclock_gettime.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff -up make-3.82/configure\~ make-3.82/configure
|
||||||
|
--- make-3.82/configure~ 2010-07-28 07:41:51.000000000 +0200
|
||||||
|
+++ make-3.82/configure 2010-08-11 15:07:50.000000000 +0200
|
||||||
|
@@ -7215,7 +7215,7 @@ return clock_gettime ();
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
-for ac_lib in '' rt posix4; do
|
||||||
|
+for ac_lib in '' posix4; do
|
||||||
|
if test -z "$ac_lib"; then
|
||||||
|
ac_res="none required"
|
||||||
|
else
|
||||||
|
|
||||||
|
Diff finished. Wed Aug 11 15:07:59 2010
|
36
make-4.3-cloexec.patch
Normal file
36
make-4.3-cloexec.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
From d79fe162c009788888faaf0317253b6f0cac7092 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kevin Buettner <kevinb@redhat.com>
|
||||||
|
Date: Thu, 23 Apr 2020 17:05:34 -0400
|
||||||
|
Subject: [SV 58232] Disable inheritance of jobserver FDs for recursive make
|
||||||
|
|
||||||
|
A parent make will invoke a sub-make with close-on-exec disabled for
|
||||||
|
the jobserver pipe FDs. Force close-on-exec to be to be enabled in
|
||||||
|
the sub-make so the pipe is not always passed to child jobs.
|
||||||
|
|
||||||
|
I have a test case which, when invoked with a suitable -j switch,
|
||||||
|
will hang if the recipe inherits the jobserver pipe. This test case
|
||||||
|
was inspired by a real world case in which testing GDB on Fedora
|
||||||
|
would hang due to some poorly written test GDB cases having been
|
||||||
|
passed the jobserver file descriptors.
|
||||||
|
|
||||||
|
* src/posixos.c (jobserver_parse_auth): Call fd_noinherit() for
|
||||||
|
jobserver pipe descriptors.
|
||||||
|
|
||||||
|
Copyright-paperwork-exempt: yes
|
||||||
|
|
||||||
|
diff --git a/src/posixos.c b/src/posixos.c
|
||||||
|
index 525f292c..eab175a4 100644
|
||||||
|
--- a/src/posixos.c
|
||||||
|
+++ b/src/posixos.c
|
||||||
|
@@ -145,6 +145,11 @@ jobserver_parse_auth (const char *auth)
|
||||||
|
/* When using pselect() we want the read to be non-blocking. */
|
||||||
|
set_blocking (job_fds[0], 0);
|
||||||
|
|
||||||
|
+ /* By default we don't send the job pipe FDs to our children.
|
||||||
|
+ See jobserver_pre_child() and jobserver_post_child(). */
|
||||||
|
+ fd_noinherit (job_fds[0]);
|
||||||
|
+ fd_noinherit (job_fds[1]);
|
||||||
|
+
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
268
make-4.3-filter-out.patch
Normal file
268
make-4.3-filter-out.patch
Normal file
@ -0,0 +1,268 @@
|
|||||||
|
From e49e11e069fe7f214263be1782242b9b50f71eaa Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paul Smith <psmith@gnu.org>
|
||||||
|
Date: Thu, 12 Nov 2020 17:00:39 -0500
|
||||||
|
Subject: [SV 59093] Rewrite filter/filter-out to avoid large stack usage
|
||||||
|
|
||||||
|
* src/function.c (func_filter_filterout): Allocate arrays to hold
|
||||||
|
pattern and word information rather than creating linked lists on
|
||||||
|
the stack.
|
||||||
|
* tests/scripts/functions/filter-out: Test large filters.
|
||||||
|
|
||||||
|
diff --git a/src/function.c b/src/function.c
|
||||||
|
index 0917e0cd..5edfe8b3 100644
|
||||||
|
--- a/src/function.c
|
||||||
|
+++ b/src/function.c
|
||||||
|
@@ -910,7 +910,6 @@ func_foreach (char *o, char **argv, const char *funcname UNUSED)
|
||||||
|
|
||||||
|
struct a_word
|
||||||
|
{
|
||||||
|
- struct a_word *next;
|
||||||
|
struct a_word *chain;
|
||||||
|
char *str;
|
||||||
|
size_t length;
|
||||||
|
@@ -941,7 +940,6 @@ a_word_hash_cmp (const void *x, const void *y)
|
||||||
|
|
||||||
|
struct a_pattern
|
||||||
|
{
|
||||||
|
- struct a_pattern *next;
|
||||||
|
char *str;
|
||||||
|
char *percent;
|
||||||
|
size_t length;
|
||||||
|
@@ -950,78 +948,84 @@ struct a_pattern
|
||||||
|
static char *
|
||||||
|
func_filter_filterout (char *o, char **argv, const char *funcname)
|
||||||
|
{
|
||||||
|
- struct a_word *wordhead;
|
||||||
|
- struct a_word **wordtail;
|
||||||
|
+ struct a_word *words;
|
||||||
|
+ struct a_word *word_end;
|
||||||
|
struct a_word *wp;
|
||||||
|
- struct a_pattern *pathead;
|
||||||
|
- struct a_pattern **pattail;
|
||||||
|
+ struct a_pattern *patterns;
|
||||||
|
+ struct a_pattern *pat_end;
|
||||||
|
struct a_pattern *pp;
|
||||||
|
+ size_t pat_count = 0, word_count = 0;
|
||||||
|
|
||||||
|
struct hash_table a_word_table;
|
||||||
|
int is_filter = funcname[CSTRLEN ("filter")] == '\0';
|
||||||
|
- const char *pat_iterator = argv[0];
|
||||||
|
- const char *word_iterator = argv[1];
|
||||||
|
+ const char *cp;
|
||||||
|
int literals = 0;
|
||||||
|
- int words = 0;
|
||||||
|
int hashing = 0;
|
||||||
|
char *p;
|
||||||
|
size_t len;
|
||||||
|
+ int doneany = 0;
|
||||||
|
|
||||||
|
- /* Chop ARGV[0] up into patterns to match against the words.
|
||||||
|
- We don't need to preserve it because our caller frees all the
|
||||||
|
- argument memory anyway. */
|
||||||
|
+ /* Find the number of words and get memory for them. */
|
||||||
|
+ cp = argv[1];
|
||||||
|
+ while ((p = find_next_token (&cp, NULL)) != 0)
|
||||||
|
+ ++word_count;
|
||||||
|
|
||||||
|
- pattail = &pathead;
|
||||||
|
- while ((p = find_next_token (&pat_iterator, &len)) != 0)
|
||||||
|
- {
|
||||||
|
- struct a_pattern *pat = alloca (sizeof (struct a_pattern));
|
||||||
|
+ if (!word_count)
|
||||||
|
+ return o;
|
||||||
|
+
|
||||||
|
+ words = xcalloc (word_count * sizeof (struct a_word));
|
||||||
|
+ word_end = words + word_count;
|
||||||
|
|
||||||
|
- *pattail = pat;
|
||||||
|
- pattail = &pat->next;
|
||||||
|
+ /* Find the number of patterns and get memory for them. */
|
||||||
|
+ cp = argv[0];
|
||||||
|
+ while ((p = find_next_token (&cp, NULL)) != 0)
|
||||||
|
+ ++pat_count;
|
||||||
|
|
||||||
|
- if (*pat_iterator != '\0')
|
||||||
|
- ++pat_iterator;
|
||||||
|
+ patterns = xcalloc (pat_count * sizeof (struct a_pattern));
|
||||||
|
+ pat_end = patterns + pat_count;
|
||||||
|
+
|
||||||
|
+ /* Chop argv[0] up into patterns to match against the words. */
|
||||||
|
+
|
||||||
|
+ cp = argv[0];
|
||||||
|
+ pp = patterns;
|
||||||
|
+ while ((p = find_next_token (&cp, &len)) != 0)
|
||||||
|
+ {
|
||||||
|
+ if (*cp != '\0')
|
||||||
|
+ ++cp;
|
||||||
|
|
||||||
|
- pat->str = p;
|
||||||
|
p[len] = '\0';
|
||||||
|
- pat->percent = find_percent (p);
|
||||||
|
- if (pat->percent == 0)
|
||||||
|
+ pp->str = p;
|
||||||
|
+ pp->percent = find_percent (p);
|
||||||
|
+ if (pp->percent == 0)
|
||||||
|
literals++;
|
||||||
|
-
|
||||||
|
/* find_percent() might shorten the string so LEN is wrong. */
|
||||||
|
- pat->length = strlen (pat->str);
|
||||||
|
+ pp->length = strlen (pp->str);
|
||||||
|
+
|
||||||
|
+ ++pp;
|
||||||
|
}
|
||||||
|
- *pattail = 0;
|
||||||
|
|
||||||
|
/* Chop ARGV[1] up into words to match against the patterns. */
|
||||||
|
|
||||||
|
- wordtail = &wordhead;
|
||||||
|
- while ((p = find_next_token (&word_iterator, &len)) != 0)
|
||||||
|
+ cp = argv[1];
|
||||||
|
+ wp = words;
|
||||||
|
+ while ((p = find_next_token (&cp, &len)) != 0)
|
||||||
|
{
|
||||||
|
- struct a_word *word = alloca (sizeof (struct a_word));
|
||||||
|
-
|
||||||
|
- *wordtail = word;
|
||||||
|
- wordtail = &word->next;
|
||||||
|
-
|
||||||
|
- if (*word_iterator != '\0')
|
||||||
|
- ++word_iterator;
|
||||||
|
+ if (*cp != '\0')
|
||||||
|
+ ++cp;
|
||||||
|
|
||||||
|
p[len] = '\0';
|
||||||
|
- word->str = p;
|
||||||
|
- word->length = len;
|
||||||
|
- word->matched = 0;
|
||||||
|
- word->chain = 0;
|
||||||
|
- words++;
|
||||||
|
+ wp->str = p;
|
||||||
|
+ wp->length = len;
|
||||||
|
+ ++wp;
|
||||||
|
}
|
||||||
|
- *wordtail = 0;
|
||||||
|
|
||||||
|
/* Only use a hash table if arg list lengths justifies the cost. */
|
||||||
|
- hashing = (literals >= 2 && (literals * words) >= 10);
|
||||||
|
+ hashing = (literals > 1 && (literals * word_count) >= 10);
|
||||||
|
if (hashing)
|
||||||
|
{
|
||||||
|
- hash_init (&a_word_table, words, a_word_hash_1, a_word_hash_2,
|
||||||
|
+ hash_init (&a_word_table, word_count, a_word_hash_1, a_word_hash_2,
|
||||||
|
a_word_hash_cmp);
|
||||||
|
- for (wp = wordhead; wp != 0; wp = wp->next)
|
||||||
|
+ for (wp = words; wp < word_end; ++wp)
|
||||||
|
{
|
||||||
|
struct a_word *owp = hash_insert (&a_word_table, wp);
|
||||||
|
if (owp)
|
||||||
|
@@ -1029,51 +1033,49 @@ func_filter_filterout (char *o, char **argv, const char *funcname)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (words)
|
||||||
|
+ /* Run each pattern through the words, killing words. */
|
||||||
|
+ for (pp = patterns; pp < pat_end; ++pp)
|
||||||
|
{
|
||||||
|
- int doneany = 0;
|
||||||
|
-
|
||||||
|
- /* Run each pattern through the words, killing words. */
|
||||||
|
- for (pp = pathead; pp != 0; pp = pp->next)
|
||||||
|
+ if (pp->percent)
|
||||||
|
+ for (wp = words; wp < word_end; ++wp)
|
||||||
|
+ wp->matched |= pattern_matches (pp->str, pp->percent, wp->str);
|
||||||
|
+ else if (hashing)
|
||||||
|
{
|
||||||
|
- if (pp->percent)
|
||||||
|
- for (wp = wordhead; wp != 0; wp = wp->next)
|
||||||
|
- wp->matched |= pattern_matches (pp->str, pp->percent, wp->str);
|
||||||
|
- else if (hashing)
|
||||||
|
+ struct a_word a_word_key;
|
||||||
|
+ a_word_key.str = pp->str;
|
||||||
|
+ a_word_key.length = pp->length;
|
||||||
|
+ wp = hash_find_item (&a_word_table, &a_word_key);
|
||||||
|
+ while (wp)
|
||||||
|
{
|
||||||
|
- struct a_word a_word_key;
|
||||||
|
- a_word_key.str = pp->str;
|
||||||
|
- a_word_key.length = pp->length;
|
||||||
|
- wp = hash_find_item (&a_word_table, &a_word_key);
|
||||||
|
- while (wp)
|
||||||
|
- {
|
||||||
|
- wp->matched |= 1;
|
||||||
|
- wp = wp->chain;
|
||||||
|
- }
|
||||||
|
+ wp->matched |= 1;
|
||||||
|
+ wp = wp->chain;
|
||||||
|
}
|
||||||
|
- else
|
||||||
|
- for (wp = wordhead; wp != 0; wp = wp->next)
|
||||||
|
- wp->matched |= (wp->length == pp->length
|
||||||
|
- && strneq (pp->str, wp->str, wp->length));
|
||||||
|
}
|
||||||
|
+ else
|
||||||
|
+ for (wp = words; wp < word_end; ++wp)
|
||||||
|
+ wp->matched |= (wp->length == pp->length
|
||||||
|
+ && strneq (pp->str, wp->str, wp->length));
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- /* Output the words that matched (or didn't, for filter-out). */
|
||||||
|
- for (wp = wordhead; wp != 0; wp = wp->next)
|
||||||
|
- if (is_filter ? wp->matched : !wp->matched)
|
||||||
|
- {
|
||||||
|
- o = variable_buffer_output (o, wp->str, strlen (wp->str));
|
||||||
|
- o = variable_buffer_output (o, " ", 1);
|
||||||
|
- doneany = 1;
|
||||||
|
- }
|
||||||
|
+ /* Output the words that matched (or didn't, for filter-out). */
|
||||||
|
+ for (wp = words; wp < word_end; ++wp)
|
||||||
|
+ if (is_filter ? wp->matched : !wp->matched)
|
||||||
|
+ {
|
||||||
|
+ o = variable_buffer_output (o, wp->str, strlen (wp->str));
|
||||||
|
+ o = variable_buffer_output (o, " ", 1);
|
||||||
|
+ doneany = 1;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- if (doneany)
|
||||||
|
- /* Kill the last space. */
|
||||||
|
- --o;
|
||||||
|
- }
|
||||||
|
+ if (doneany)
|
||||||
|
+ /* Kill the last space. */
|
||||||
|
+ --o;
|
||||||
|
|
||||||
|
if (hashing)
|
||||||
|
hash_free (&a_word_table, 0);
|
||||||
|
|
||||||
|
+ free (patterns);
|
||||||
|
+ free (words);
|
||||||
|
+
|
||||||
|
return o;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/tests/scripts/functions/filter-out b/tests/scripts/functions/filter-out
|
||||||
|
index 1fe4819d..dec5343e 100644
|
||||||
|
--- a/tests/scripts/functions/filter-out
|
||||||
|
+++ b/tests/scripts/functions/filter-out
|
||||||
|
@@ -27,6 +27,22 @@ all: ; @echo '$(files1) $(files2)'
|
||||||
|
!,
|
||||||
|
'', "foo.elc foo.elc\n");
|
||||||
|
|
||||||
|
+# Force use of hash (see function.c:func_filter_filterout for params)
|
||||||
|
+
|
||||||
|
+my $base = 'foo.1 foo.2 foo.3 foo.4 foo.5 foo.6 foo.7 foo.8 foo.9 foo.10';
|
||||||
|
+
|
||||||
|
+my $base10 = join(' ', ($base) x 10);
|
||||||
|
+my $out3 = join(' ', ('foo.3') x 10);
|
||||||
|
+my $out456 = join(' ', ('foo.4 foo.5 foo.6') x 10);
|
||||||
|
+
|
||||||
|
+run_make_test("words := $base10" . q!
|
||||||
|
+files1 := $(filter %.3, $(words))
|
||||||
|
+files2 := $(filter %.4 foo.5 foo.6, $(words))
|
||||||
|
+all: ; @echo '$(files1) $(files2)'
|
||||||
|
+!,
|
||||||
|
+ '', "$out3 $out456\n");
|
||||||
|
+
|
||||||
|
+
|
||||||
|
# Escaped patterns
|
||||||
|
run_make_test(q!all:;@echo '$(filter foo\%bar,foo%bar fooXbar)'!,
|
||||||
|
'', "foo%bar\n");
|
12
make-4.3-getcwd.patch
Normal file
12
make-4.3-getcwd.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -Nrup a/src/makeint.h b/src/makeint.h
|
||||||
|
--- a/src/makeint.h 2016-05-21 16:22:32.000000000 -0400
|
||||||
|
+++ b/src/makeint.h 2016-09-22 16:12:38.606702160 -0400
|
||||||
|
@@ -596,7 +596,7 @@ long int lseek ();
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef HAVE_GETCWD
|
||||||
|
-# if !defined(VMS) && !defined(__DECC)
|
||||||
|
+# if !defined(VMS) && !defined(__DECC) && !defined(getcwd)
|
||||||
|
char *getcwd ();
|
||||||
|
# endif
|
||||||
|
# else
|
25
make-4.3-j8k.patch
Normal file
25
make-4.3-j8k.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
diff -Nrup a/src/main.c b/src/main.c
|
||||||
|
--- a/src/main.c 2016-05-31 03:17:26.000000000 -0400
|
||||||
|
+++ b/src/main.c 2016-09-22 16:18:52.283889265 -0400
|
||||||
|
@@ -2051,6 +2051,21 @@ main (int argc, char **argv, char **envp
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#ifdef PIPE_BUF
|
||||||
|
+ if (job_slots > PIPE_BUF)
|
||||||
|
+#elif defined _POSIX_PIPE_BUF
|
||||||
|
+ if (job_slots > _POSIX_PIPE_BUF)
|
||||||
|
+#else
|
||||||
|
+ if (job_slots > 512)
|
||||||
|
+#endif
|
||||||
|
+ {
|
||||||
|
+ O (error, NILF,
|
||||||
|
+ _("More parallel jobs (-jN) than this platform can handle requested."));
|
||||||
|
+ O (error, NILF, _("Resetting to single job (-j1) mode."));
|
||||||
|
+ job_slots = 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+
|
||||||
|
/* If we have >1 slot at this point, then we're a top-level make.
|
||||||
|
Set up the jobserver.
|
||||||
|
|
487
make.spec
487
make.spec
@ -1,23 +1,81 @@
|
|||||||
Summary: A GNU tool which simplifies the build process for users.
|
# -*- coding: utf-8 -*-
|
||||||
|
# This decides the SRPM name. Set to "make" for a rolling release
|
||||||
|
# (like Fedora) or "make-latest" for a long term release that needs
|
||||||
|
# optional versioned updates.
|
||||||
Name: make
|
Name: make
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 3.80
|
Version: 4.3
|
||||||
Release: 8
|
Release: 11%{?dist}
|
||||||
License: GPL
|
License: GPLv3+
|
||||||
Group: Development/Tools
|
|
||||||
URL: http://www.gnu.org/software/make/
|
URL: http://www.gnu.org/software/make/
|
||||||
Source: ftp://ftp.gnu.org/gnu/make/make-%{version}.tar.bz2
|
Source: ftp://ftp.gnu.org/gnu/make/make-%{version}.tar.gz
|
||||||
Patch: make-3.79.1-noclock_gettime.patch
|
|
||||||
Patch2: make-3.79.1-siglist.patch
|
|
||||||
Patch3: make-3.80-cvs.patch
|
|
||||||
Patch4: make-3.80-j8k.patch
|
|
||||||
Patch5: make-3.80-getcwd.patch
|
|
||||||
Patch6: make-3.80-err-reporting.patch
|
|
||||||
Prereq: /sbin/install-info
|
|
||||||
Prefix: %{_prefix}
|
|
||||||
Buildroot: %{_tmppath}/%{name}-root
|
|
||||||
|
|
||||||
%description
|
%if "%{name}" != "make"
|
||||||
|
# Set this to the sub-package base name, for "make-latest"
|
||||||
|
%global make make43
|
||||||
|
%if 0%{?rhel} > 0
|
||||||
|
%global _prefix /opt/rh/%{make}
|
||||||
|
%else
|
||||||
|
# We intentionally do not define a case for Fedora, as it should not
|
||||||
|
# need this functionality, and letting it error avoids accidents.
|
||||||
|
%{error:"Each downstream must specify its own /opt namespace"}
|
||||||
|
%endif
|
||||||
|
Summary: Meta package to include latest version of make
|
||||||
|
%else
|
||||||
|
%global make %{name}
|
||||||
|
Summary: A GNU tool which simplifies the build process for users
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?rhel} > 0
|
||||||
|
# This gives the user the option of saying --with guile, but defaults to WITHOUT
|
||||||
|
%bcond_with guile
|
||||||
|
%else
|
||||||
|
# This gives the user the option of saying --without guile, but defaults to WITH
|
||||||
|
%bcond_without guile
|
||||||
|
%endif
|
||||||
|
|
||||||
|
Patch0: make-4.3-getcwd.patch
|
||||||
|
|
||||||
|
# Assume we don't have clock_gettime in configure, so that
|
||||||
|
# make is not linked against -lpthread (and thus does not
|
||||||
|
# limit stack to 2MB).
|
||||||
|
Patch1: make-4.0-noclock_gettime.patch
|
||||||
|
|
||||||
|
# BZs #142691, #17374
|
||||||
|
Patch2: make-4.3-j8k.patch
|
||||||
|
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1827850
|
||||||
|
# https://savannah.gnu.org/bugs/?58232
|
||||||
|
# Remove on next make rebase
|
||||||
|
Patch3: make-4.3-cloexec.patch
|
||||||
|
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=2010506
|
||||||
|
# https://savannah.gnu.org/bugs/?59093
|
||||||
|
# Remove on next make rebase
|
||||||
|
Patch4: make-4.3-filter-out.patch
|
||||||
|
|
||||||
|
# autoreconf
|
||||||
|
BuildRequires: make
|
||||||
|
BuildRequires: autoconf, automake, gettext-devel
|
||||||
|
BuildRequires: procps
|
||||||
|
BuildRequires: perl
|
||||||
|
%if %{with guile}
|
||||||
|
BuildRequires: pkgconfig(guile-2.2)
|
||||||
|
%endif
|
||||||
|
BuildRequires: gcc
|
||||||
|
|
||||||
|
%if "%{name}" != "make"
|
||||||
|
# We're still on the make-latest package
|
||||||
|
Requires: %{make}
|
||||||
|
%description -n make-latest
|
||||||
|
The latest GNU Make, with a version-specific install
|
||||||
|
%files -n make-latest
|
||||||
|
|
||||||
|
%package -n %{make}
|
||||||
|
Summary: A GNU tool which simplifies the build process for users
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%description -n %{make}
|
||||||
A GNU tool for controlling the generation of executables and other
|
A GNU tool for controlling the generation of executables and other
|
||||||
non-source files of a program from the program's source files. Make
|
non-source files of a program from the program's source files. Make
|
||||||
allows users to build and install packages without any significant
|
allows users to build and install packages without any significant
|
||||||
@ -25,58 +83,381 @@ knowledge about the details of the build process. The details about
|
|||||||
how the program should be built are provided for make in the program's
|
how the program should be built are provided for make in the program's
|
||||||
makefile.
|
makefile.
|
||||||
|
|
||||||
The GNU make tool should be installed on your system because it is
|
%package -n %{make}-devel
|
||||||
commonly used to simplify the process of installing programs.
|
Summary: Header file for externally visible definitions
|
||||||
|
|
||||||
|
%description -n %{make}-devel
|
||||||
|
The %{make}-devel package contains gnumake.h.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -n make-%{version} -p1
|
||||||
%patch -p1
|
|
||||||
#%patch2 -p1
|
rm -f tests/scripts/features/parallelism.orig
|
||||||
%patch3 -p0
|
|
||||||
%patch4 -p1
|
|
||||||
%patch5 -p1
|
|
||||||
%patch6 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
#autoreconf -f --install
|
autoreconf -vfi
|
||||||
%configure
|
|
||||||
#touch .deps/remote-stub.Po # Workaround for broken automake files
|
%configure \
|
||||||
make %{?_smp_mflags}
|
%if %{with guile}
|
||||||
make check
|
--with-guile
|
||||||
|
%else
|
||||||
|
--without-guile
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%make_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf ${RPM_BUILD_ROOT}
|
%make_install
|
||||||
|
ln -sf make ${RPM_BUILD_ROOT}/%{_bindir}/gmake
|
||||||
|
ln -sf make.1 ${RPM_BUILD_ROOT}/%{_mandir}/man1/gmake.1
|
||||||
|
rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir
|
||||||
|
|
||||||
%makeinstall
|
%if "%{name}" != "make"
|
||||||
|
install -d -m 755 ${RPM_BUILD_ROOT}/etc/scl/prefixes
|
||||||
|
dirname %{_prefix} > %{make}.prefix
|
||||||
|
install -p -m 644 %{make}.prefix ${RPM_BUILD_ROOT}/etc/scl/prefixes/%{make}
|
||||||
|
|
||||||
pushd ${RPM_BUILD_ROOT}
|
echo "export PATH=%{_prefix}/bin:\$PATH" > enable.scl
|
||||||
ln -sf make .%{_bindir}/gmake
|
install -p -m 755 enable.scl ${RPM_BUILD_ROOT}/%{_prefix}/enable
|
||||||
#gzip -9nf .%{_infodir}/make.info*
|
%endif
|
||||||
rm -f .%{_infodir}/dir
|
|
||||||
chmod ug-s .%{_bindir}/*
|
|
||||||
popd
|
|
||||||
|
|
||||||
%find_lang %name
|
%find_lang make
|
||||||
|
|
||||||
%clean
|
%check
|
||||||
rm -rf ${RPM_BUILD_ROOT}
|
echo ============TESTING===============
|
||||||
|
/usr/bin/env LANG=C make check && true
|
||||||
|
echo ============END TESTING===========
|
||||||
|
|
||||||
%post
|
%files -n %{make} -f make.lang
|
||||||
/sbin/install-info %{_infodir}/make.info.gz %{_infodir}/dir --entry="* Make: (make). The GNU make utility."
|
%license COPYING
|
||||||
|
%doc NEWS README AUTHORS
|
||||||
%preun
|
|
||||||
if [ $1 = 0 ]; then
|
|
||||||
/sbin/install-info --delete %{_infodir}/make.info.gz %{_infodir}/dir --entry="* Make: (make). The GNU make utility."
|
|
||||||
fi
|
|
||||||
|
|
||||||
%files -f %{name}.lang
|
|
||||||
%defattr(-,root,root)
|
|
||||||
%doc NEWS README
|
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
%{_mandir}/man*/*
|
%{_mandir}/man*/*
|
||||||
%{_infodir}/*.info*
|
%{_infodir}/*.info*
|
||||||
|
%{_includedir}/gnumake.h
|
||||||
|
%if "%{name}" != "make"
|
||||||
|
/etc/scl/prefixes/%{make}
|
||||||
|
%{_prefix}/enable
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%files -n %{make}-devel
|
||||||
|
%{_includedir}/gnumake.h
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.3-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 14 2022 DJ Delorie <dj@redhat.com> - 1:4.3-10
|
||||||
|
- Add SCL compatibility to LTS builds.
|
||||||
|
|
||||||
|
* Wed Jun 29 2022 DJ Delorie <dj@redhat.com> - 1:4.3-9
|
||||||
|
- Enable long-term supported builds.
|
||||||
|
|
||||||
|
* Fri Apr 8 2022 DJ Delorie <dj@redhat.com> - 1:4.3-8
|
||||||
|
- Rewrite filter/filter-out to avoid large stack usage. BZ #2010506
|
||||||
|
- Require perl core modules for testsuite
|
||||||
|
|
||||||
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.3-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.3-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 19 2021 DJ Delorie <dj@redhat.com> - 1:4.3-5
|
||||||
|
- Allow users to build with or without guile support as desired.
|
||||||
|
- Allow derivative downstreams to default to disabling guile support.
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.3-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 29 2020 DJ Delorie <dj@redhat.com> - 1:4.3-3
|
||||||
|
- Disable inheritance of jobserver FDs for recursive make. BZ #1827850
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.3-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Mar 11 2020 DJ Delorie <dj@redhat.com> - 1:4.3-1
|
||||||
|
- Rebase to make-4.3. Remove obsolete patches.
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.2.1-16
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Dec 06 2019 DJ Delorie <dj@redhat.com> - 1:4.2.1-15
|
||||||
|
- Use a non-blocking read with pselect to avoid hangs. BZ #1556839
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.2.1-14
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:4.2.1-13
|
||||||
|
- Run autoreconf
|
||||||
|
|
||||||
|
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:4.2.1-12
|
||||||
|
- Switch to latest guile version
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.2.1-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.2.1-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Apr 25 2018 Patsy Griffin Franklin <pfrankli@redhat.com> 1:4.2.1-9
|
||||||
|
- Fix build failure caused by automake versioning differences related
|
||||||
|
to the glob changes.
|
||||||
|
- Fix testing failure due to Perl changes related to expanding paths.
|
||||||
|
|
||||||
|
* Tue Feb 20 2018 Rex Dieter <rdieter@fedoraproject.org> - 1:4.2.1-8
|
||||||
|
- BR: gcc, rebuild (guile)
|
||||||
|
|
||||||
|
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.2.1-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 02 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:4.2.1-6
|
||||||
|
- Fix wrong assumptions of glibc's glob internals
|
||||||
|
|
||||||
|
* Thu Feb 01 2018 Richard W.M. Jones <rjones@redhat.com> - 1:4.2.1-5
|
||||||
|
- Add upstream patch to fix incorrect use of glibc 2.27 glob internals.
|
||||||
|
|
||||||
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.2.1-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.2.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Feb 01 2017 Stephen Gallagher <sgallagh@redhat.com> - 4.2.1-2
|
||||||
|
- Add missing %%license macro
|
||||||
|
|
||||||
|
* Sun Sep 25 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.2.1-1
|
||||||
|
- Rebase to make-4.2.1. Remove obsolete patches. BZ #1338558
|
||||||
|
|
||||||
|
* Sun Sep 25 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.1-6
|
||||||
|
- Make test suite requires Perl to run.
|
||||||
|
|
||||||
|
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.1-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Nov 4 2015 Patsy Franklin <pfrankli@redhat.com> 1:4.1-4
|
||||||
|
- Handle NULL returns from ttyname() Upstream Bug 43434.
|
||||||
|
Resolves: #1277968
|
||||||
|
|
||||||
|
* Thu Oct 29 2015 Patsy Franklin <pfrankli@redhat.com> 1:4.1-3
|
||||||
|
- Enable Guile support.
|
||||||
|
|
||||||
|
* Thu Oct 29 2015 Patsy Franklin <pfrankli@redhat.com> 1:4.1-2
|
||||||
|
- Include patches dropped in last update as they fix reported bugs and
|
||||||
|
update the spec file to include more info on the patches.
|
||||||
|
|
||||||
|
* Sat Oct 24 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@laptop> - 1:4.1-1
|
||||||
|
- Update to latest version
|
||||||
|
|
||||||
|
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.0-5.1
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 1:4.0-4.1
|
||||||
|
- Rebuilt for Fedora 23 Change
|
||||||
|
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
|
||||||
|
|
||||||
|
* Wed Sep 03 2014 Kyle McMartin <kyle@fedoraproject.org> - 1:4.0-3.1
|
||||||
|
- Pass the test-suite unconditionally until I fix the tests to cope with
|
||||||
|
deterministic ar archives (which result in expected rebuilds not occuring)
|
||||||
|
|
||||||
|
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Apr 30 2014 Patsy Franklin <pfrankli@redhat.com> 1:4.0-1
|
||||||
|
- Rebase to make-4.0
|
||||||
|
- Created make-devel sub-package to handle new dependency on gnumake.h.
|
||||||
|
|
||||||
|
* Thu Aug 22 2013 Petr Machata <pmachata@redhat.com> - 1:3.82-19
|
||||||
|
- make now restores rlimit to its original values before launching
|
||||||
|
subprocess via $(shell) (make-3.82-func_shell-rlimit.patch)
|
||||||
|
- Determinize one test (make-3.82-tests-SECONDARY.patch)
|
||||||
|
|
||||||
|
* Fri Jul 26 2013 Petr Machata <pmachata@redhat.com> - 1:3.82-18
|
||||||
|
- Backport upstream patch that adds wildcard expansion to pattern
|
||||||
|
rules. (make-3.82-stem_glob.patch)
|
||||||
|
|
||||||
|
* Wed Jun 19 2013 Petr Machata <pmachata@redhat.com> - 1:3.82-17
|
||||||
|
- Add another fix for upstream bug 30612
|
||||||
|
|
||||||
|
* Thu Apr 4 2013 Petr Machata <pmachata@redhat.com> - 1:3.82-16
|
||||||
|
- Update config.sub and config.guess to support aarch64
|
||||||
|
|
||||||
|
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.82-15
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Nov 29 2012 Petr Machata <pmachata@redhat.com> - 1:3.82-14
|
||||||
|
- Drop patch5, which hasn't been applied for years
|
||||||
|
|
||||||
|
* Mon Sep 10 2012 Petr Machata <pmachata@redhat.com> - 1:3.82-13
|
||||||
|
- Add fix for upstream bug 30653
|
||||||
|
- Resolves: #835424
|
||||||
|
|
||||||
|
* Fri Jul 27 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.82-12
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Mar 13 2012 Petr Machata <pmachata@redhat.com> - 1:3.82-11
|
||||||
|
- Add a patch for avoiding glob if possible by Michael Meeks
|
||||||
|
|
||||||
|
* Mon Mar 12 2012 Petr Machata <pmachata@redhat.com> - 1:3.82-10
|
||||||
|
- Apply the following patches, proposed upstream by Norbert Thiebaud:
|
||||||
|
- A patch for warning on call of undefined function
|
||||||
|
- A patch for tracing calls to "eval" and "call"
|
||||||
|
|
||||||
|
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.82-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Nov 3 2011 Petr Machata <pmachata@redhat.com> - 1:3.82-8
|
||||||
|
- Add a patch for preserving -j across Makefile rebuild
|
||||||
|
- Resolves: #698702
|
||||||
|
|
||||||
|
* Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.82-7
|
||||||
|
- Rebuilt for glibc bug#747377
|
||||||
|
|
||||||
|
* Thu May 12 2011 Lubomir Rintel <lkundrak@v3.sk> - 1:3.82-6
|
||||||
|
- Fix free-after-use with nested assignments (#703104)
|
||||||
|
|
||||||
|
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.82-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Oct 27 2010 Petr Machata <pmachata@redhat.com> - 1:3.82-4
|
||||||
|
- Fix a discrepancy between behavior of find_next_token and
|
||||||
|
pre-allocation of token memory in func_sort.
|
||||||
|
- Resolves: #643359
|
||||||
|
|
||||||
|
* Wed Sep 29 2010 jkeating - 1:3.82-3
|
||||||
|
- Rebuilt for gcc bug 634757
|
||||||
|
|
||||||
|
* Mon Sep 13 2010 Petr Machata <pmachata@redhat.com> - 1:3.82-2
|
||||||
|
- Add upstream fixes for upstream bugs 30612 and 30723
|
||||||
|
- Resolves: #631552
|
||||||
|
|
||||||
|
* Wed Aug 11 2010 Petr Machata <pmachata@redhat.com> - 1:3.82-1
|
||||||
|
- Upstream 3.82:
|
||||||
|
- Drop rlimit, fdleak, strcpy-overlap, recursion-test, double-free
|
||||||
|
patches, make supports this functionality now
|
||||||
|
- Disable the memory patch for the time being
|
||||||
|
- Port remaining patches
|
||||||
|
- Add weird-shell patch, upstream bug 30748
|
||||||
|
- Resolves: #618998
|
||||||
|
|
||||||
|
* Wed Aug 11 2010 Petr Machata <pmachata@redhat.com> - 1:3.81-21
|
||||||
|
- Add BR procps
|
||||||
|
- Resolves: #616813
|
||||||
|
|
||||||
|
* Thu Jul 1 2010 Petr Machata <pmachata@redhat.com> - 1:3.81-20
|
||||||
|
- Add a patch by Steve Kemp @debian that might fix the double free
|
||||||
|
problem.
|
||||||
|
- Related: #609806
|
||||||
|
|
||||||
|
* Fri Jun 4 2010 Petr Machata <pmachata@redhat.com> - 1:3.81-19
|
||||||
|
- Fix testsuite on F13
|
||||||
|
- Resolves: #600004
|
||||||
|
|
||||||
|
* Tue Aug 11 2009 Petr Machata <pmachata@redhat.com> - 1:3.81-18
|
||||||
|
- Fix installation with --excludedocs
|
||||||
|
- Resolves: #515917
|
||||||
|
|
||||||
|
* Fri Jul 31 2009 Petr Machata <pmachata@redhat.com> - 1:3.81-17
|
||||||
|
- Replace the use of strcpy on overlapping areas with memmove
|
||||||
|
- Resolves: #514721
|
||||||
|
|
||||||
|
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.81-16
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.81-15
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Sep 22 2008 Petr Machata <pmachata@redhat.com> - 1:3.81-14
|
||||||
|
- Fix patches to apply cleanly with fuzz=0
|
||||||
|
|
||||||
|
* Tue Sep 16 2008 Petr Machata <pmachata@redhat.com> - 1:3.81-13
|
||||||
|
- Mark opened files as cloexec to prevent their leaking through fork
|
||||||
|
- Resolves: #462090
|
||||||
|
|
||||||
|
* Tue Mar 25 2008 Petr Machata <pmachata@redhat.com> - 1:3.81-12
|
||||||
|
- Fix the rlimit patch. The success flag is kept in memory shared
|
||||||
|
with parent process after vfork, and so cannot be reset.
|
||||||
|
- Related: #214033
|
||||||
|
|
||||||
|
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1:3.81-11
|
||||||
|
- Autorebuild for GCC 4.3
|
||||||
|
|
||||||
|
* Thu Oct 4 2007 Petr Machata <pmachata@redhat.com> - 1:3.81-10
|
||||||
|
- Fix parallel builds with reexec.
|
||||||
|
- Related: #212111, #211290
|
||||||
|
|
||||||
|
* Thu Oct 4 2007 Petr Machata <pmachata@redhat.com> - 1:3.81-8
|
||||||
|
- Cleaned up per merge review.
|
||||||
|
- Related: #226120
|
||||||
|
|
||||||
|
* Thu Aug 16 2007 Petr Machata <pmachata@redhat.com> - 1:3.81-7
|
||||||
|
- Fix licensing tag.
|
||||||
|
|
||||||
|
* Fri Mar 16 2007 Petr Machata <pmachata@redhat.com> - 1:3.81-6
|
||||||
|
- Always run testsuite with C locale.
|
||||||
|
- Resolves: #232607
|
||||||
|
|
||||||
|
* Thu Feb 22 2007 Petr Machata <pmachata@redhat.com> - 1:3.81-5
|
||||||
|
- Fix newline handling for quoted SHELL.
|
||||||
|
- Resolves: #219409
|
||||||
|
|
||||||
|
* Fri Feb 2 2007 Petr Machata <pmachata@redhat.com> - 1:3.81-4
|
||||||
|
- Tidy up the specfile per rpmlint comments
|
||||||
|
- Use utf-8 and fix national characters in contributor's names
|
||||||
|
|
||||||
|
* Thu Jan 25 2007 Petr Machata <pmachata@redhat.com> - 1:3.81-3
|
||||||
|
- Ville Skyttä: patch for non-failing %%post, %%preun
|
||||||
|
- Resolves: #223709
|
||||||
|
|
||||||
|
* Thu Jan 25 2007 Petr Machata <pmachata@redhat.com> - 1:3.81-2
|
||||||
|
- make now restores rlimit to its original values before launching
|
||||||
|
subprocess (#214033)
|
||||||
|
|
||||||
|
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1:3.81-1.1
|
||||||
|
- rebuild
|
||||||
|
|
||||||
|
* Tue May 23 2006 Petr Machata <pmachata@redhat.com> - 1:3.81-1
|
||||||
|
- Upstream 3.81:
|
||||||
|
- Contains several backwards incompatible changes. See NEWS inside
|
||||||
|
the source package to find out more.
|
||||||
|
- memory patch and error reporting patch were ported to this version.
|
||||||
|
|
||||||
|
* Wed Mar 15 2006 Petr Machata <pmachata@redhat.com> 1:3.80-11
|
||||||
|
- Applied (five years old) patch from Jonathan Kamens to allow make to
|
||||||
|
handle several pattern-specific variables (#52962).
|
||||||
|
|
||||||
|
The patch was changed so that it forces make to process pattern
|
||||||
|
specific variables in the same order as they appear in file.
|
||||||
|
(Upstream make behaves this way, too.) This is change from old make
|
||||||
|
behavior, which processed the variables in reverse order. In case
|
||||||
|
you used only x=a assignments, this had the effect of using the
|
||||||
|
first pattern specific variable that matched. For x+=a this just
|
||||||
|
doesn't work, and it produces absolutely nonintuitive results.
|
||||||
|
|
||||||
|
- (It would be great if make's target-specific variables were handled
|
||||||
|
the same way as pattern-specific ones, just without the pattern
|
||||||
|
component. However current handling is documented and considered a
|
||||||
|
feature.)
|
||||||
|
|
||||||
|
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1:3.80-10.2
|
||||||
|
- bump again for double-long bug on ppc(64)
|
||||||
|
|
||||||
|
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1:3.80-10.1
|
||||||
|
- rebuilt for new gcc4.1 snapshot and glibc changes
|
||||||
|
|
||||||
|
* Thu Feb 02 2006 Petr Machata <pmachata@redhat.com> 3.80-10
|
||||||
|
- H.J. Lu caught a typo in the patch and provided a new one. (#175376)
|
||||||
|
|
||||||
|
* Mon Jan 09 2006 Petr Machata <pmachata@redhat.com> 3.80-9
|
||||||
|
- Applied patch from H.J. Lu. Somehow reduces make's enormous memory
|
||||||
|
consumption. (#175376)
|
||||||
|
|
||||||
|
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
|
||||||
|
- rebuilt
|
||||||
|
|
||||||
* Mon Aug 22 2005 Jakub Jelinek <jakub@redhat.com> 3.80-8
|
* Mon Aug 22 2005 Jakub Jelinek <jakub@redhat.com> 3.80-8
|
||||||
- make sure errno for error reporting is not lost accross _() calls
|
- make sure errno for error reporting is not lost accross _() calls
|
||||||
- report EOF on read pipe differently from read returning < 0 reporting
|
- report EOF on read pipe differently from read returning < 0 reporting
|
||||||
@ -130,7 +511,7 @@ fi
|
|||||||
* Fri Jan 25 2002 Jakub Jelinek <jakub@redhat.com>
|
* Fri Jan 25 2002 Jakub Jelinek <jakub@redhat.com>
|
||||||
- rebuilt with gcc 3.1
|
- rebuilt with gcc 3.1
|
||||||
|
|
||||||
* Fri Jul 6 2001 Trond Eivind Glomsrød <teg@redhat.com>
|
* Fri Jul 6 2001 Trond Eivind Glomsrød <teg@redhat.com>
|
||||||
- s/Copyright/License/
|
- s/Copyright/License/
|
||||||
- langify
|
- langify
|
||||||
- Make sure it isn't setgid if built as root
|
- Make sure it isn't setgid if built as root
|
||||||
|
6
plans/ci.fmf
Normal file
6
plans/ci.fmf
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
summary: CI Gating Plan
|
||||||
|
discover:
|
||||||
|
how: fmf
|
||||||
|
directory: tests
|
||||||
|
execute:
|
||||||
|
how: beakerlib
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
0bbd1df101bc0294d440471e50feca71 make-3.80.tar.bz2
|
SHA512 (make-4.3.tar.gz) = 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b
|
||||||
|
@ -0,0 +1,63 @@
|
|||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Makefile of /tools/make/Regression/GNU-make-utility-v-3-82-shipped-with-el7-breaks
|
||||||
|
# Description: Test for GNU make utility v.3.82 shipped with el7 breaks
|
||||||
|
# Author: Michal Kolar <mkolar@redhat.com>
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Copyright (c) 2016 Red Hat, Inc.
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 2 of
|
||||||
|
# the License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be
|
||||||
|
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||||
|
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||||
|
# PURPOSE. See the GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
export TEST=/tools/make/Regression/GNU-make-utility-v-3-82-shipped-with-el7-breaks
|
||||||
|
export TESTVERSION=1.0
|
||||||
|
|
||||||
|
BUILT_FILES=
|
||||||
|
|
||||||
|
FILES=$(METADATA) runtest.sh Makefile PURPOSE test.mk golden.output
|
||||||
|
|
||||||
|
.PHONY: all install download clean
|
||||||
|
|
||||||
|
run: $(FILES) build
|
||||||
|
./runtest.sh
|
||||||
|
|
||||||
|
build: $(BUILT_FILES)
|
||||||
|
test -x runtest.sh || chmod a+x runtest.sh
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f *~ $(BUILT_FILES)
|
||||||
|
|
||||||
|
|
||||||
|
include /usr/share/rhts/lib/rhts-make.include
|
||||||
|
|
||||||
|
$(METADATA): Makefile
|
||||||
|
@echo "Owner: Michal Kolar <mkolar@redhat.com>" > $(METADATA)
|
||||||
|
@echo "Name: $(TEST)" >> $(METADATA)
|
||||||
|
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
|
||||||
|
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
||||||
|
@echo "Description: GNU make utility v.3.82 shipped with el7 breaks" >> $(METADATA)
|
||||||
|
@echo "Type: Regression" >> $(METADATA)
|
||||||
|
@echo "TestTime: 2m" >> $(METADATA)
|
||||||
|
@echo "RunFor: make" >> $(METADATA)
|
||||||
|
@echo "Requires: make coreutils sed diffutils" >> $(METADATA)
|
||||||
|
@echo "Priority: Normal" >> $(METADATA)
|
||||||
|
@echo "License: GPLv2+" >> $(METADATA)
|
||||||
|
@echo "Confidential: yes" >> $(METADATA)
|
||||||
|
@echo "Destructive: no" >> $(METADATA)
|
||||||
|
@echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
|
||||||
|
|
||||||
|
rhts-lint $(METADATA)
|
@ -0,0 +1,3 @@
|
|||||||
|
PURPOSE of /tools/make/Regression/GNU-make-utility-v-3-82-shipped-with-el7-breaks
|
||||||
|
Author: Michal Kolar <mkolar@redhat.com>
|
||||||
|
Summary: GNU make utility v.3.82 shipped with el7 breaks environment vars
|
@ -0,0 +1,2 @@
|
|||||||
|
echo "TEST=false"
|
||||||
|
TEST=false
|
@ -0,0 +1,17 @@
|
|||||||
|
summary: GNU make utility v.3.82 shipped with el7 breaks
|
||||||
|
description: |
|
||||||
|
Summary: GNU make utility v.3.82 shipped with el7 breaks environment vars
|
||||||
|
contact:
|
||||||
|
- Michal Kolar <mkolar@redhat.com>
|
||||||
|
component:
|
||||||
|
- make
|
||||||
|
test: ./runtest.sh
|
||||||
|
framework: beakerlib
|
||||||
|
recommend:
|
||||||
|
- make
|
||||||
|
- coreutils
|
||||||
|
- sed
|
||||||
|
- diffutils
|
||||||
|
duration: 2m
|
||||||
|
extra-summary: /tools/make/Regression/GNU-make-utility-v-3-82-shipped-with-el7-breaks
|
||||||
|
extra-task: /tools/make/Regression/GNU-make-utility-v-3-82-shipped-with-el7-breaks
|
57
tests/GNU-make-utility-v-3-82-shipped-with-el7-breaks/runtest.sh
Executable file
57
tests/GNU-make-utility-v-3-82-shipped-with-el7-breaks/runtest.sh
Executable file
@ -0,0 +1,57 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# runtest.sh of /tools/make/Regression/GNU-make-utility-v-3-82-shipped-with-el7-breaks
|
||||||
|
# Description: Test for BZ#1323206 (GNU make utility v.3.82 shipped with el7 breaks)
|
||||||
|
# Author: Michal Kolar <mkolar@redhat.com>
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Copyright (c) 2016 Red Hat, Inc.
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 2 of
|
||||||
|
# the License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be
|
||||||
|
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||||
|
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||||
|
# PURPOSE. See the GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
# Include Beaker environment
|
||||||
|
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||||
|
|
||||||
|
CMD="make"
|
||||||
|
PACKAGE="make"
|
||||||
|
BIN="$(which $CMD)"
|
||||||
|
export PACKAGE="${PACKAGE:-$(rpm -qf --qf='%{name}\n' $BIN)}"
|
||||||
|
|
||||||
|
rlJournalStart
|
||||||
|
rlPhaseStartSetup
|
||||||
|
rlShowRunningKernel
|
||||||
|
rlAssertRpm $PACKAGE
|
||||||
|
rlRun "TmpDir=\$(mktemp -d)"
|
||||||
|
rlRun "cp test.mk golden.output $TmpDir"
|
||||||
|
rlRun "pushd $TmpDir"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartTest
|
||||||
|
rlRun "make -f test.mk test TEST=false >stdout"
|
||||||
|
rlRun "sed -i -e '/Entering directory/d' -e '/Leaving directory/d' stdout"
|
||||||
|
rlRun "diff golden.output stdout"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartCleanup
|
||||||
|
rlRun "popd"
|
||||||
|
rlRun "rm -r $TmpDir"
|
||||||
|
rlPhaseEnd
|
||||||
|
rlJournalPrintText
|
||||||
|
rlJournalEnd
|
||||||
|
|
@ -0,0 +1,5 @@
|
|||||||
|
# User makefile
|
||||||
|
|
||||||
|
test: TEST ?= true
|
||||||
|
test:
|
||||||
|
echo "TEST=$(TEST)"
|
63
tests/Use-after-free-when-eval-in-variable/Makefile
Normal file
63
tests/Use-after-free-when-eval-in-variable/Makefile
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Makefile of /tools/make/Regression/Use-after-free-when-eval-in-variable
|
||||||
|
# Description: Test for Use-after-free() when eval in variable
|
||||||
|
# Author: Marek Polacek <polacek@redhat.com>
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Copyright (c) 2012 Red Hat, Inc. All rights reserved.
|
||||||
|
#
|
||||||
|
# This copyrighted material is made available to anyone wishing
|
||||||
|
# to use, modify, copy, or redistribute it subject to the terms
|
||||||
|
# and conditions of the GNU General Public License version 2.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be
|
||||||
|
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||||
|
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||||
|
# PURPOSE. See the GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public
|
||||||
|
# License along with this program; if not, write to the Free
|
||||||
|
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||||
|
# Boston, MA 02110-1301, USA.
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
export TEST=/tools/make/Regression/Use-after-free-when-eval-in-variable
|
||||||
|
export TESTVERSION=1.0
|
||||||
|
|
||||||
|
BUILT_FILES=
|
||||||
|
|
||||||
|
FILES=$(METADATA) runtest.sh Makefile PURPOSE test.mk
|
||||||
|
|
||||||
|
.PHONY: all install download clean
|
||||||
|
|
||||||
|
run: $(FILES) build
|
||||||
|
./runtest.sh
|
||||||
|
|
||||||
|
build: $(BUILT_FILES)
|
||||||
|
test -x runtest.sh || chmod a+x runtest.sh
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f *~ $(BUILT_FILES)
|
||||||
|
|
||||||
|
|
||||||
|
include /usr/share/rhts/lib/rhts-make.include
|
||||||
|
|
||||||
|
$(METADATA): Makefile
|
||||||
|
@echo "Owner: Marek Polacek <polacek@redhat.com>" > $(METADATA)
|
||||||
|
@echo "Name: $(TEST)" >> $(METADATA)
|
||||||
|
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
|
||||||
|
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
||||||
|
@echo "Description: Test for Use-after-free() when eval in variable)" >> $(METADATA)
|
||||||
|
@echo "Type: Regression" >> $(METADATA)
|
||||||
|
@echo "TestTime: 2m" >> $(METADATA)
|
||||||
|
@echo "RunFor: make" >> $(METADATA)
|
||||||
|
@echo "Requires: make coreutils" >> $(METADATA)
|
||||||
|
@echo "Priority: Normal" >> $(METADATA)
|
||||||
|
@echo "License: GPLv2" >> $(METADATA)
|
||||||
|
@echo "Confidential: no" >> $(METADATA)
|
||||||
|
@echo "Destructive: no" >> $(METADATA)
|
||||||
|
|
||||||
|
rhts-lint $(METADATA)
|
3
tests/Use-after-free-when-eval-in-variable/PURPOSE
Normal file
3
tests/Use-after-free-when-eval-in-variable/PURPOSE
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
PURPOSE of /tools/make/Regression/Use-after-free-when-eval-in-variable
|
||||||
|
Author: Marek Polacek <polacek@redhat.com>
|
||||||
|
Summary: Use-after-free() when eval in variable assignments reassigns the same variable
|
15
tests/Use-after-free-when-eval-in-variable/main.fmf
Normal file
15
tests/Use-after-free-when-eval-in-variable/main.fmf
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
summary: Test for Use-after-free() when eval in variable)
|
||||||
|
description: |
|
||||||
|
Summary: Use-after-free() when eval in variable assignments reassigns the same variable
|
||||||
|
contact:
|
||||||
|
- Marek Polacek <polacek@redhat.com>
|
||||||
|
component:
|
||||||
|
- make
|
||||||
|
test: ./runtest.sh
|
||||||
|
framework: beakerlib
|
||||||
|
recommend:
|
||||||
|
- make
|
||||||
|
- coreutils
|
||||||
|
duration: 2m
|
||||||
|
extra-summary: /tools/make/Regression/Use-after-free-when-eval-in-variable
|
||||||
|
extra-task: /tools/make/Regression/Use-after-free-when-eval-in-variable
|
55
tests/Use-after-free-when-eval-in-variable/runtest.sh
Executable file
55
tests/Use-after-free-when-eval-in-variable/runtest.sh
Executable file
@ -0,0 +1,55 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# runtest.sh of /tools/make/Regression/Use-after-free-when-eval-in-variable
|
||||||
|
# Description: Test for Use-after-free() when eval in variable
|
||||||
|
# Author: Marek Polacek <polacek@redhat.com>
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Copyright (c) 2012 Red Hat, Inc. All rights reserved.
|
||||||
|
#
|
||||||
|
# This copyrighted material is made available to anyone wishing
|
||||||
|
# to use, modify, copy, or redistribute it subject to the terms
|
||||||
|
# and conditions of the GNU General Public License version 2.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be
|
||||||
|
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||||
|
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||||
|
# PURPOSE. See the GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public
|
||||||
|
# License along with this program; if not, write to the Free
|
||||||
|
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||||
|
# Boston, MA 02110-1301, USA.
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
# Include Beaker environment
|
||||||
|
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||||
|
|
||||||
|
CMD="make"
|
||||||
|
BIN="$(which $CMD)"
|
||||||
|
PACKAGE="make"
|
||||||
|
export PACKAGE="${PACKAGE:-$(rpm -qf --qf='%{name}\n' $BIN)}"
|
||||||
|
|
||||||
|
rlJournalStart
|
||||||
|
rlPhaseStartSetup
|
||||||
|
rlShowRunningKernel
|
||||||
|
rlAssertRpm $PACKAGE
|
||||||
|
rlRun "TmpDir=\$(mktemp -d)"
|
||||||
|
rlRun "cp test.mk $TmpDir"
|
||||||
|
rlRun "pushd $TmpDir"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartTest
|
||||||
|
rlRun "make -f test.mk"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartCleanup
|
||||||
|
rlRun "popd"
|
||||||
|
rlRun "rm -r $TmpDir"
|
||||||
|
rlPhaseEnd
|
||||||
|
rlJournalPrintText
|
||||||
|
rlJournalEnd
|
2
tests/Use-after-free-when-eval-in-variable/test.mk
Normal file
2
tests/Use-after-free-when-eval-in-variable/test.mk
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
VARIABLE = $(eval VARIABLE := $(shell sleep 1; echo echo ahoj))$(VARIABLE)
|
||||||
|
wololo:; $(VARIABLE)
|
63
tests/make-3-79-has-a-parsing-bug/Makefile
Normal file
63
tests/make-3-79-has-a-parsing-bug/Makefile
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Makefile of /tools/make/Regression/make-3-79-has-a-parsing-bug
|
||||||
|
# Description: make 3.79 has a parsing bug
|
||||||
|
# Author: Michal Kolar <mkolar@redhat.com>
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Copyright (c) 2017 Red Hat, Inc.
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 2 of
|
||||||
|
# the License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be
|
||||||
|
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||||
|
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||||
|
# PURPOSE. See the GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
export TEST=/tools/make/Regression/make-3-79-has-a-parsing-bug
|
||||||
|
export TESTVERSION=1.0
|
||||||
|
|
||||||
|
BUILT_FILES=
|
||||||
|
|
||||||
|
FILES=$(METADATA) runtest.sh Makefile PURPOSE test.mk
|
||||||
|
|
||||||
|
.PHONY: all install download clean
|
||||||
|
|
||||||
|
run: $(FILES) build
|
||||||
|
./runtest.sh
|
||||||
|
|
||||||
|
build: $(BUILT_FILES)
|
||||||
|
test -x runtest.sh || chmod a+x runtest.sh
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f *~ $(BUILT_FILES)
|
||||||
|
|
||||||
|
|
||||||
|
include /usr/share/rhts/lib/rhts-make.include
|
||||||
|
|
||||||
|
$(METADATA): Makefile
|
||||||
|
@echo "Owner: Michal Kolar <mkolar@redhat.com>" > $(METADATA)
|
||||||
|
@echo "Name: $(TEST)" >> $(METADATA)
|
||||||
|
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
|
||||||
|
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
||||||
|
@echo "Description: make 3.79 has a parsing bug" >> $(METADATA)
|
||||||
|
@echo "Type: Regression" >> $(METADATA)
|
||||||
|
@echo "TestTime: 1m" >> $(METADATA)
|
||||||
|
@echo "RunFor: make" >> $(METADATA)
|
||||||
|
@echo "Requires: make coreutils" >> $(METADATA)
|
||||||
|
@echo "Priority: Normal" >> $(METADATA)
|
||||||
|
@echo "License: GPLv2+" >> $(METADATA)
|
||||||
|
@echo "Confidential: no" >> $(METADATA)
|
||||||
|
@echo "Destructive: no" >> $(METADATA)
|
||||||
|
@echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
|
||||||
|
|
||||||
|
rhts-lint $(METADATA)
|
3
tests/make-3-79-has-a-parsing-bug/PURPOSE
Normal file
3
tests/make-3-79-has-a-parsing-bug/PURPOSE
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
PURPOSE of /tools/make/Regression/make-3-79-has-a-parsing-bug
|
||||||
|
Description: make 3.79 has a parsing bug
|
||||||
|
Author: Michal Kolar <mkolar@redhat.com>
|
14
tests/make-3-79-has-a-parsing-bug/main.fmf
Normal file
14
tests/make-3-79-has-a-parsing-bug/main.fmf
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
summary: make 3.79 has a parsing bug
|
||||||
|
description: ''
|
||||||
|
contact:
|
||||||
|
- Michal Kolar <mkolar@redhat.com>
|
||||||
|
component:
|
||||||
|
- make
|
||||||
|
test: ./runtest.sh
|
||||||
|
framework: beakerlib
|
||||||
|
recommend:
|
||||||
|
- make
|
||||||
|
- coreutils
|
||||||
|
duration: 1m
|
||||||
|
extra-summary: /tools/make/Regression/make-3-79-has-a-parsing-bug
|
||||||
|
extra-task: /tools/make/Regression/make-3-79-has-a-parsing-bug
|
55
tests/make-3-79-has-a-parsing-bug/runtest.sh
Executable file
55
tests/make-3-79-has-a-parsing-bug/runtest.sh
Executable file
@ -0,0 +1,55 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# runtest.sh of /tools/make/Regression/make-3-79-has-a-parsing-bug
|
||||||
|
# Description: make 3.79 has a parsing bug
|
||||||
|
# Author: Michal Kolar <mkolar@redhat.com>
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Copyright (c) 2017 Red Hat, Inc.
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 2 of
|
||||||
|
# the License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be
|
||||||
|
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||||
|
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||||
|
# PURPOSE. See the GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
# Include Beaker environment
|
||||||
|
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||||
|
|
||||||
|
CMD="make"
|
||||||
|
BIN="$(which $CMD)"
|
||||||
|
PACKAGE="make"
|
||||||
|
export PACKAGE="${PACKAGE:-$(rpm -qf --qf='%{name}\n' $BIN)}"
|
||||||
|
|
||||||
|
rlJournalStart
|
||||||
|
rlPhaseStartSetup
|
||||||
|
rlShowRunningKernel
|
||||||
|
rlAssertRpm $PACKAGE
|
||||||
|
rlRun "TmpDir=\$(mktemp -d)"
|
||||||
|
rlRun "cp test.mk $TmpDir"
|
||||||
|
rlRun "pushd $TmpDir"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartTest
|
||||||
|
rlRun "touch file.l"
|
||||||
|
rlRun "make -f test.mk"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartCleanup
|
||||||
|
rlRun "popd"
|
||||||
|
rlRun "rm -r $TmpDir"
|
||||||
|
rlPhaseEnd
|
||||||
|
rlJournalPrintText
|
||||||
|
rlJournalEnd
|
13
tests/make-3-79-has-a-parsing-bug/test.mk
Normal file
13
tests/make-3-79-has-a-parsing-bug/test.mk
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
# Author: Petr Muller <pmuller@redhat.com>
|
||||||
|
|
||||||
|
default: out/file.o
|
||||||
|
%/.exists:
|
||||||
|
-mkdir $(@D)
|
||||||
|
touch $@
|
||||||
|
src/file.c: file.l src/.exists
|
||||||
|
@echo file.l to $@
|
||||||
|
touch $@
|
||||||
|
out/%.o: src/%.c out/.exists
|
||||||
|
@echo -c $< -o $@
|
||||||
|
touch $@
|
||||||
|
|
63
tests/order-only/Makefile
Normal file
63
tests/order-only/Makefile
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Makefile of /tools/make/Regression/order-only
|
||||||
|
# Description: Test for make bug
|
||||||
|
# Author: Petr Muller <pmuller@redhat.com>
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Copyright (c) 2017 Red Hat, Inc.
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 3 of
|
||||||
|
# the License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be
|
||||||
|
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||||
|
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||||
|
# PURPOSE. See the GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
export TEST=/tools/make/Regression/order-only
|
||||||
|
export TESTVERSION=1.0
|
||||||
|
|
||||||
|
BUILT_FILES=
|
||||||
|
|
||||||
|
FILES=$(METADATA) runtest.sh Makefile PURPOSE test.mk golden.output
|
||||||
|
|
||||||
|
.PHONY: all install download clean
|
||||||
|
|
||||||
|
run: $(FILES) build
|
||||||
|
./runtest.sh
|
||||||
|
|
||||||
|
build: $(BUILT_FILES)
|
||||||
|
test -x runtest.sh || chmod a+x runtest.sh
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f *~ $(BUILT_FILES)
|
||||||
|
|
||||||
|
|
||||||
|
include /usr/share/rhts/lib/rhts-make.include
|
||||||
|
|
||||||
|
$(METADATA): Makefile
|
||||||
|
@echo "Owner: Petr Muller <pmuller@redhat.com>" > $(METADATA)
|
||||||
|
@echo "Name: $(TEST)" >> $(METADATA)
|
||||||
|
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
|
||||||
|
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
||||||
|
@echo "Description: Test for make bug" >> $(METADATA)
|
||||||
|
@echo "Type: Regression" >> $(METADATA)
|
||||||
|
@echo "TestTime: 1m" >> $(METADATA)
|
||||||
|
@echo "RunFor: make" >> $(METADATA)
|
||||||
|
@echo "Requires: make coreutils diffutils" >> $(METADATA)
|
||||||
|
@echo "Priority: Normal" >> $(METADATA)
|
||||||
|
@echo "License: GPLv3" >> $(METADATA)
|
||||||
|
@echo "Confidential: no" >> $(METADATA)
|
||||||
|
@echo "Destructive: no" >> $(METADATA)
|
||||||
|
@echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
|
||||||
|
|
||||||
|
rhts-lint $(METADATA)
|
4
tests/order-only/PURPOSE
Normal file
4
tests/order-only/PURPOSE
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
PURPOSE of /tools/make/Regression/order-only
|
||||||
|
Description: Regression Test for make bug
|
||||||
|
Author: Petr Muller <pmuller@redhat.com>
|
||||||
|
Summary: Test that make doesn't insert bogus values into order-only dependencies
|
9
tests/order-only/golden.output
Normal file
9
tests/order-only/golden.output
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
mkdir -p dir/b/.
|
||||||
|
@ [a/b/c]
|
||||||
|
^ []
|
||||||
|
? []
|
||||||
|
mkdir -p a/b/.
|
||||||
|
@ [a]
|
||||||
|
^ []
|
||||||
|
? []
|
||||||
|
rm dir/b/.
|
16
tests/order-only/main.fmf
Normal file
16
tests/order-only/main.fmf
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
summary: Test for make bug
|
||||||
|
description: |
|
||||||
|
Summary: Test that make doesn't insert bogus values into order-only dependencies
|
||||||
|
contact:
|
||||||
|
- Petr Muller <pmuller@redhat.com>
|
||||||
|
component:
|
||||||
|
- make
|
||||||
|
test: ./runtest.sh
|
||||||
|
framework: beakerlib
|
||||||
|
recommend:
|
||||||
|
- make
|
||||||
|
- coreutils
|
||||||
|
- diffutils
|
||||||
|
duration: 1m
|
||||||
|
extra-summary: /tools/make/Regression/order-only
|
||||||
|
extra-task: /tools/make/Regression/order-only
|
55
tests/order-only/runtest.sh
Executable file
55
tests/order-only/runtest.sh
Executable file
@ -0,0 +1,55 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# runtest.sh of /tools/make/Regression/order-only
|
||||||
|
# Description: Test for make bug
|
||||||
|
# Author: Petr Muller <pmuller@redhat.com>
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Copyright (c) 2017 Red Hat, Inc.
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 3 of
|
||||||
|
# the License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be
|
||||||
|
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||||
|
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||||
|
# PURPOSE. See the GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
# Include Beaker environment
|
||||||
|
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||||
|
|
||||||
|
CMD="make"
|
||||||
|
BIN="$(which $CMD)"
|
||||||
|
PACKAGE="make"
|
||||||
|
export PACKAGE="${PACKAGE:-$(rpm -qf --qf='%{name}\n' $BIN)}"
|
||||||
|
|
||||||
|
rlJournalStart
|
||||||
|
rlPhaseStartSetup
|
||||||
|
rlShowRunningKernel
|
||||||
|
rlAssertRpm $PACKAGE
|
||||||
|
rlRun "TmpDir=\$(mktemp -d)"
|
||||||
|
rlRun "cp test.mk golden.output $TmpDir"
|
||||||
|
rlRun "pushd $TmpDir"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartTest
|
||||||
|
rlRun "make -f test.mk | grep -v -e 'Entering' -e 'Leaving' >tested.output"
|
||||||
|
rlRun "diff golden.output tested.output"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartCleanup
|
||||||
|
rlRun "popd"
|
||||||
|
rlRun "rm -r $TmpDir"
|
||||||
|
rlPhaseEnd
|
||||||
|
rlJournalPrintText
|
||||||
|
rlJournalEnd
|
17
tests/order-only/test.mk
Normal file
17
tests/order-only/test.mk
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
all: ./a/b/c a
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -rf a dir
|
||||||
|
|
||||||
|
%/.:
|
||||||
|
mkdir -p $(@)
|
||||||
|
|
||||||
|
a/%/c: | ./dir/%/.
|
||||||
|
@echo "@ [$@]"
|
||||||
|
@echo "^ [$^]"
|
||||||
|
@echo "? [$?]"
|
||||||
|
|
||||||
|
a: | ./a/b/.
|
||||||
|
@echo "@ [$@]"
|
||||||
|
@echo "^ [$^]"
|
||||||
|
@echo "? [$?]"
|
63
tests/smoke-check-make-runs/Makefile
Normal file
63
tests/smoke-check-make-runs/Makefile
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Makefile of /tools/make/Sanity/smoke-check-make-runs
|
||||||
|
# Description: Show your version. Build a one-file project.
|
||||||
|
# Author: Vaclav Kadlcik <vkadlcik@redhat.com>
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Copyright (c) 2015 Red Hat, Inc.
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 2 of
|
||||||
|
# the License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be
|
||||||
|
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||||
|
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||||
|
# PURPOSE. See the GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
export TEST=/tools/make/Sanity/smoke-check-make-runs
|
||||||
|
export TESTVERSION=1.0
|
||||||
|
|
||||||
|
BUILT_FILES=
|
||||||
|
|
||||||
|
FILES=$(METADATA) runtest.sh Makefile PURPOSE hello_world.c smoke.mk
|
||||||
|
|
||||||
|
.PHONY: all install download clean
|
||||||
|
|
||||||
|
run: $(FILES) build
|
||||||
|
./runtest.sh
|
||||||
|
|
||||||
|
build: $(BUILT_FILES)
|
||||||
|
test -x runtest.sh || chmod a+x runtest.sh
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f *~ $(BUILT_FILES)
|
||||||
|
|
||||||
|
|
||||||
|
include /usr/share/rhts/lib/rhts-make.include
|
||||||
|
|
||||||
|
$(METADATA): Makefile
|
||||||
|
@echo "Owner: Vaclav Kadlcik <vkadlcik@redhat.com>" > $(METADATA)
|
||||||
|
@echo "Name: $(TEST)" >> $(METADATA)
|
||||||
|
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
|
||||||
|
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
||||||
|
@echo "Description: Show your version. Build a one-file project." >> $(METADATA)
|
||||||
|
@echo "Type: Sanity" >> $(METADATA)
|
||||||
|
@echo "TestTime: 5m" >> $(METADATA)
|
||||||
|
@echo "RunFor: make" >> $(METADATA)
|
||||||
|
@echo "Requires: make gcc" >> $(METADATA)
|
||||||
|
@echo "Priority: Normal" >> $(METADATA)
|
||||||
|
@echo "License: GPLv2+" >> $(METADATA)
|
||||||
|
@echo "Confidential: no" >> $(METADATA)
|
||||||
|
@echo "Destructive: no" >> $(METADATA)
|
||||||
|
@echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
|
||||||
|
|
||||||
|
rhts-lint $(METADATA)
|
3
tests/smoke-check-make-runs/PURPOSE
Normal file
3
tests/smoke-check-make-runs/PURPOSE
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
PURPOSE of /tools/make/Sanity/smoke-check-make-runs
|
||||||
|
Description: Show your version. Build a one-file project.
|
||||||
|
Author: Vaclav Kadlcik <vkadlcik@redhat.com>
|
8
tests/smoke-check-make-runs/hello_world.c
Normal file
8
tests/smoke-check-make-runs/hello_world.c
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
int main(int argc, char ** argv) {
|
||||||
|
if (printf("Hello world!\n") < 0) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
14
tests/smoke-check-make-runs/main.fmf
Normal file
14
tests/smoke-check-make-runs/main.fmf
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
summary: Show your version. Build a one-file project.
|
||||||
|
description: ''
|
||||||
|
contact:
|
||||||
|
- Vaclav Kadlcik <vkadlcik@redhat.com>
|
||||||
|
component:
|
||||||
|
- make
|
||||||
|
test: ./runtest.sh
|
||||||
|
framework: beakerlib
|
||||||
|
recommend:
|
||||||
|
- make
|
||||||
|
- gcc
|
||||||
|
duration: 5m
|
||||||
|
extra-summary: /tools/make/Sanity/smoke-check-make-runs
|
||||||
|
extra-task: /tools/make/Sanity/smoke-check-make-runs
|
61
tests/smoke-check-make-runs/runtest.sh
Executable file
61
tests/smoke-check-make-runs/runtest.sh
Executable file
@ -0,0 +1,61 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# runtest.sh of /tools/make/Sanity/smoke-check-make-runs
|
||||||
|
# Description: Show your version. Build a one-file project.
|
||||||
|
# Author: Vaclav Kadlcik <vkadlcik@redhat.com>
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Copyright (c) 2015 Red Hat, Inc.
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 2 of
|
||||||
|
# the License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be
|
||||||
|
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||||
|
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||||
|
# PURPOSE. See the GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
# Include Beaker environment
|
||||||
|
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||||
|
|
||||||
|
MAKE="$(which --skip-alias make)"
|
||||||
|
PACKAGE="make"
|
||||||
|
export PACKAGE="${PACKAGE:-$(rpm -qf --qf='%{name}\n' $MAKE)}"
|
||||||
|
|
||||||
|
rlJournalStart
|
||||||
|
rlPhaseStartSetup
|
||||||
|
rlAssertRpm $PACKAGE
|
||||||
|
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
|
||||||
|
rlRun "cp hello_world.c $TmpDir"
|
||||||
|
rlRun "cp smoke.mk $TmpDir/Makefile"
|
||||||
|
rlRun "pushd $TmpDir"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartTest
|
||||||
|
rlRun -t -s 'make -v'
|
||||||
|
rlAssertNotGrep '^STDERR:' $rlRun_LOG
|
||||||
|
rlAssertGrep '^STDOUT: GNU Make [0-9]' $rlRun_LOG
|
||||||
|
rlAssertNotExists 'hello_world'
|
||||||
|
rlRun 'make'
|
||||||
|
rlAssertExists 'hello_world'
|
||||||
|
rlRun './hello_world'
|
||||||
|
rlRun 'make clean'
|
||||||
|
rlAssertNotExists 'hello_world'
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartCleanup
|
||||||
|
rlRun "popd"
|
||||||
|
rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
|
||||||
|
rlPhaseEnd
|
||||||
|
rlJournalPrintText
|
||||||
|
rlJournalEnd
|
9
tests/smoke-check-make-runs/smoke.mk
Normal file
9
tests/smoke-check-make-runs/smoke.mk
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
all: hello_world
|
||||||
|
|
||||||
|
hello_world: hello_world.o
|
||||||
|
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f hello_world hello_world.o
|
||||||
|
|
||||||
|
.SUFFIXES: .c
|
Loading…
Reference in New Issue
Block a user