[LTP] [PATCH 05/10] Add CVE .gitignore, Makefile and runtest files

Cyril Hrubis chrubis@suse.cz
Fri May 19 15:06:16 CEST 2017


Hi!
> +include $(top_srcdir)/include/mk/testcases.mk
> +
> +CFLAGS			+= -D_GNU_SOURCE
> +
> +<<<<<<< HEAD
> +cve-2016-7117:	LDFLAGS += -lpthread
> +=======
> +cve-2014-0196:	LDFLAGS += -lpthread -lutil -lrt
> +cve-2016-7117:	LDFLAGS += -lpthread -lrt
> +>>>>>>> 4dbfb8e79... Add -lrt

Unsolved merge conflict here and in the next file.

-- 
Cyril Hrubis
chrubis@suse.cz


More information about the ltp mailing list