socsvn commit: r256808 - soc2013/mattbw/backend

[mattbw at FreeBSD.org]

Author: mattbw
Date: Sun Sep  1 20:50:12 2013
New Revision: 256808
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=256808

Log:
  Add namever unit tests.
  
  Not much to report here, just some more unit tests.
  

Modified:
  soc2013/mattbw/backend/Atffile
  soc2013/mattbw/backend/Makefile
  soc2013/mattbw/backend/namever.c
  soc2013/mattbw/backend/namever.h

Modified: soc2013/mattbw/backend/Atffile
==============================================================================
--- soc2013/mattbw/backend/Atffile	Sun Sep  1 19:59:54 2013	(r256807)
+++ soc2013/mattbw/backend/Atffile	Sun Sep  1 20:50:12 2013	(r256808)
@@ -2,4 +2,5 @@
 
 prop: test-suite = "main"
 
+tp: namever_test
 tp: pkgutils_test

Modified: soc2013/mattbw/backend/Makefile
==============================================================================
--- soc2013/mattbw/backend/Makefile	Sun Sep  1 19:59:54 2013	(r256807)
+++ soc2013/mattbw/backend/Makefile	Sun Sep  1 20:50:12 2013	(r256808)
@@ -71,6 +71,7 @@
 
 # ATF test flags
 TESTPROGS=					\
+		namever_test			\
 		pkgutils_test			\
 		query/id_test			\
 		query/check_test		\
@@ -118,5 +119,10 @@
 pkgutils_test.o: pkgutils_test.c
 	${CC} ${CFLAGS} ${TESTCFLAGS} -o ${.TARGET} -c ${.ALLSRC}
 
+namever_test: namever_test.o namever.o
+	${CC} ${LDFLAGS} ${TESTLDFLAGS} -o ${.TARGET} ${.ALLSRC} ${LIBS} ${TESTLIBS}
+
+namever_test.o: namever_test.c
+	${CC} ${CFLAGS} ${TESTCFLAGS} -o ${.TARGET} -c ${.ALLSRC}
 
 .include <bsd.lib.mk>

Modified: soc2013/mattbw/backend/namever.c
==============================================================================
--- soc2013/mattbw/backend/namever.c	Sun Sep  1 19:59:54 2013	(r256807)
+++ soc2013/mattbw/backend/namever.c	Sun Sep  1 20:50:12 2013	(r256808)
@@ -74,7 +74,7 @@
  * To be freed using free(3).
  */
 char	       *
-namever_from_package_id(gchar *package_id)
+namever_from_package_id(const gchar *package_id)
 {
 	char	       *result;
 	gchar	      **id_splits;

Modified: soc2013/mattbw/backend/namever.h
==============================================================================
--- soc2013/mattbw/backend/namever.h	Sun Sep  1 19:59:54 2013	(r256807)
+++ soc2013/mattbw/backend/namever.h	Sun Sep  1 20:50:12 2013	(r256808)
@@ -21,9 +21,12 @@
 #ifndef _PKGNG_BACKEND_NAMEVER_H_
 #define _PKGNG_BACKEND_NAMEVER_H_
 
+#include <glib.h>		/* gchar, guint */
+#include "pkg.h"		/* struct pkg */
+
 char	       *namever_from_name_and_version(const char *name, const char *version);
 char	       *namever_from_package(struct pkg *package);
-char	       *namever_from_package_id(gchar *package_id);
+char	       *namever_from_package_id(const gchar *package_id);
 char	      **namever_array_from_package_ids(gchar **package_ids, guint count);
 void		namever_array_free(char ***namevers_p, guint count);
 #endif				/* !_PKGNG_BACKEND_NAMEVER_H_ */