[csw-devel] SF.net SVN: gar:[15945] csw/mgar/gar/v2/lib/python

[wahwah at users.sourceforge.net]

Revision: 15945
          http://gar.svn.sourceforge.net/gar/?rev=15945&view=rev
Author:   wahwah
Date:     2011-10-21 08:06:40 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
checkpkg: unit tests updated for GAR suggestions

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/dependency_checks_test.py
    csw/mgar/gar/v2/lib/python/package_checks_test.py

Modified: csw/mgar/gar/v2/lib/python/dependency_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks_test.py	2011-10-21 07:25:35 UTC (rev 15944)
+++ csw/mgar/gar/v2/lib/python/dependency_checks_test.py	2011-10-21 08:06:40 UTC (rev 15945)
@@ -297,7 +297,7 @@
         r'PKGFILES_CSWfoo-bar += '
         r'$(call baseisadirs,$(libdir),libfoo\.so\.1(\.\d+)*)')
     messenger_mock.SuggestGarLine(
-        'SPKG_DESC_CSWfoo-bar += A foo bar package, libfoo.so.1')
+        'SPKG_DESC_CSWfoo-bar += $(DESCRIPTION), libfoo.so.1')
     messenger_mock.SuggestGarLine(
         r'RUNTIME_DEP_PKGS_CSWfoo += CSWfoo-bar')
     messenger_mock.SuggestGarLine(

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2011-10-21 07:25:35 UTC (rev 15944)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2011-10-21 08:06:40 UTC (rev 15945)
@@ -1515,15 +1515,25 @@
         'file=/opt/csw/lib/sparcv9/libneon.so')
     self.messenger.SuggestGarLine("# (If CSWneon-dev doesn't exist yet)")
     self.messenger.SuggestGarLine('PACKAGES += CSWneon-dev')
+    self.messenger.SuggestGarLine('CATALOGNAME_CSWneon-dev = neon_dev')
     self.messenger.SuggestGarLine(
+        'SPKG_DESC_CSWneon-dev += $(DESCRIPTION), development files')
+    self.messenger.SuggestGarLine(
         'PKGFILES_CSWneon-dev += /opt/csw/lib/libneon.so')
-    self.messenger.SuggestGarLine('CATALOGNAME_CSWneon-dev = neon_dev')
+    self.messenger.SuggestGarLine('# Maybe also the generic:')
+    self.messenger.SuggestGarLine(
+        '# PKGFILES_CSWneon-dev += $(PKGFILES_DEVEL)')
     self.messenger.Message(mox.IsA(str))
     self.messenger.SuggestGarLine("# (If CSWneon-dev doesn't exist yet)")
     self.messenger.SuggestGarLine('PACKAGES += CSWneon-dev')
+    self.messenger.SuggestGarLine('CATALOGNAME_CSWneon-dev = neon_dev')
     self.messenger.SuggestGarLine(
+        'SPKG_DESC_CSWneon-dev += $(DESCRIPTION), development files')
+    self.messenger.SuggestGarLine(
         'PKGFILES_CSWneon-dev += /opt/csw/lib/sparcv9/libneon.so')
-    self.messenger.SuggestGarLine('CATALOGNAME_CSWneon-dev = neon_dev')
+    self.messenger.SuggestGarLine('# Maybe also the generic:')
+    self.messenger.SuggestGarLine(
+        '# PKGFILES_CSWneon-dev += $(PKGFILES_DEVEL)')
     self.messenger.Message(mox.IsA(str))
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.