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

[Mike Frysinger (vapier)]

vapier      13/09/29 22:42:36

  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.8                  portage-utils/tests/atom_explode/Makefile

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

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



1.14                 portage-utils/tests/atom_explode/test.c

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

Index: test.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/tests/atom_explode/test.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- test.c	25 Sep 2009 14:58:38 -0000	1.13
+++ test.c	29 Sep 2013 22:42:36 -0000	1.14
@@ -1,46 +1,16 @@
 /*
- * 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/atom_explode/test.c,v 1.13 2009/09/25 14:58:38 grobian Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/tests/atom_explode/test.c,v 1.14 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>
-#ifndef __INTERIX
-#include <inttypes.h>
-#endif
-#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 ARRAY_SIZE(arr) (sizeof(arr) / sizeof(*arr))
-
-#include "../../libq/xmalloc.c"
-#include "../../libq/atom_explode.c"
+#include "libq/xmalloc.c"
+#include "libq/atom_explode.c"
 
 static inline void boom(depend_atom *a, char *s)
 {