[gentoo-commits] gentoo-projects commit in portage-utils/tests/mkdir: Makefile test.c

[Mike Frysinger (vapier)]

vapier      13/09/29 22:42:37

  Modified:             Makefile test.c
  Log:
  move all headers includes and such to a single porting.h to avoid duplicating in tests/ #406393

Revision  Changes    Path
1.3                  portage-utils/tests/mkdir/Makefile

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/tests/mkdir/Makefile?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/tests/mkdir/Makefile?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/tests/mkdir/Makefile?r1=1.2&r2=1.3

Index: Makefile
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/tests/mkdir/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	12 Dec 2011 21:04:24 -0000	1.2
+++ Makefile	29 Sep 2013 22:42:36 -0000	1.3
@@ -1,13 +1,11 @@
 thisdir = mkdir
 include ../subdir.mk
 
-CFLAGS += -Wall
-
 all: $(b)/m
 
 $(b)/m: $(s)/test.c
 	mkdir -p $(b)
-	$(CC) $(CFLAGS) $< -o $@
+	$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@
 
 test check: dotest
 



1.3                  portage-utils/tests/mkdir/test.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/tests/mkdir/test.c?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/tests/mkdir/test.c?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/tests/mkdir/test.c?r1=1.2&r2=1.3

Index: test.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/tests/mkdir/test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- test.c	17 Mar 2011 01:57:27 -0000	1.2
+++ test.c	29 Sep 2013 22:42:36 -0000	1.3
@@ -1,44 +1,17 @@
 /*
- * Copyright 2005-2008 Gentoo Foundation
+ * Copyright 2005-2013 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/tests/mkdir/test.c,v 1.2 2011/03/17 01:57:27 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/tests/mkdir/test.c,v 1.3 2013/09/29 22:42:36 vapier Exp $
  *
  * Copyright 2005-2008 Ned Ludd        - <solar@g.o>
- * Copyright 2005-2008 Mike Frysinger  - <vapier@g.o>
+ * Copyright 2005-2013 Mike Frysinger  - <vapier@g.o>
  */
 
-#define _GNU_SOURCE
+#include "tests/tests.h"
 
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <getopt.h>
-#include <regex.h>
-#include <errno.h>
-#include <libgen.h>
-#include <limits.h>
-#include <assert.h>
-
-#define warnf(fmt, args...) fprintf(stderr, fmt "\n", ## args)
-#define errf(fmt, args...) \
-	do { \
-	warnf(fmt, ## args); \
-	exit(EXIT_FAILURE); \
-	} while (0)
-#define err(...) errf(__VA_ARGS__)
-#define errp(...) errf(__VA_ARGS__)
-#define _q_static static
-
-#include "../../libq/xmalloc.c"
-#include "../../libq/xstrdup.c"
-#include "../../libq/xmkdir.c"
+#include "libq/xmalloc.c"
+#include "libq/xstrdup.c"
+#include "libq/xmkdir.c"
 
 int main(int argc, char *argv[])
 {