[111306] branches/gsoc13-tests/src/package1.0

[marius at macports.org]

Revision: 111306
          https://trac.macports.org/changeset/111306
Author:   marius at macports.org
Date:     2013-09-18 13:32:32 -0700 (Wed, 18 Sep 2013)
Log Message:
-----------
package1.0: added ports tree update before running tests from makefile target

Modified Paths:
--------------
    branches/gsoc13-tests/src/package1.0/Makefile
    branches/gsoc13-tests/src/package1.0/tests/portpkg.test

Modified: branches/gsoc13-tests/src/package1.0/Makefile
===================================================================
--- branches/gsoc13-tests/src/package1.0/Makefile	2013-09-18 20:15:08 UTC (rev 111305)
+++ branches/gsoc13-tests/src/package1.0/Makefile	2013-09-18 20:32:32 UTC (rev 111306)
@@ -17,6 +17,9 @@
 distclean:: clean
 
 test::
+ifeq ($(shell id -u),0)
+	$(prefix)/bin/port sync
+endif
 	$(TCLSH) ./tests/test.tcl -nocolor
 
 install:: all

Modified: branches/gsoc13-tests/src/package1.0/tests/portpkg.test
===================================================================
--- branches/gsoc13-tests/src/package1.0/tests/portpkg.test	2013-09-18 20:15:08 UTC (rev 111305)
+++ branches/gsoc13-tests/src/package1.0/tests/portpkg.test	2013-09-18 20:32:32 UTC (rev 111306)
@@ -23,7 +23,7 @@
 test pkg_main {
     Port pkg main unit test.
 } -constraints {
-	root
+    root
 } -setup {
     global os.platform os.major os.arch epoch destpath package.destpath configure.build_arch
     global subport version revision package.flat maintainers description categories
@@ -37,25 +37,25 @@
     set packages_dir $destpath/fondu-1_060102_1.mpkg/Contents/Packages
     set res_dir $destpath/fondu-1_060102_1.mpkg/Contents/Resources
 
-	set mport [mportopen file://.]
+    set mport [mportopen file://.]
     set workername [ditem_key $mport workername]
 
 } -body {
     if {[$workername eval eval_targets pkg] != 0} {
-		return "FAIL: cannot create pkg"
+        return "FAIL: cannot create pkg. Maybe should update ports tree ?"
     }
 
     if {![file exists $pwd/work/fondu-060102_1.pkg]} {
-		return "FAIL: missing pkg file"
+        return "FAIL: missing pkg file"
     }
 
     return "Package pkg successful."
 
 } -cleanup {
-	mportclose $mport
+    mportclose $mport
     file delete -force $destpath
-	file delete -force $pwd/work
-	
+    file delete -force $pwd/work
+    
 } -result "Package pkg successful."
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130918/5d18ff72/attachment.html>