[107835] branches/gsoc13-tests/tests/test

marius at macports.org marius at macports.org
Sat Jul 6 11:58:29 PDT 2013


Revision: 107835
          https://trac.macports.org/changeset/107835
Author:   marius at macports.org
Date:     2013-07-06 11:58:29 -0700 (Sat, 06 Jul 2013)
Log Message:
-----------
Cleanup dependencies tests (initial_setup, cleanup, description, files).

Modified Paths:
--------------
    branches/gsoc13-tests/tests/test/dependencies-a/test.tcl
    branches/gsoc13-tests/tests/test/dependencies-b/test.tcl
    branches/gsoc13-tests/tests/test/dependencies-c/test.tcl
    branches/gsoc13-tests/tests/test/dependencies-d/test.tcl
    branches/gsoc13-tests/tests/test/dependencies-e/test.tcl

Added Paths:
-----------
    branches/gsoc13-tests/tests/test/dependencies-a/DESCRIPTION
    branches/gsoc13-tests/tests/test/dependencies-b/DESCRIPTION
    branches/gsoc13-tests/tests/test/dependencies-c/DESCRIPTION
    branches/gsoc13-tests/tests/test/dependencies-d/DESCRIPTION
    branches/gsoc13-tests/tests/test/dependencies-e/DESCRIPTION

Removed Paths:
-------------
    branches/gsoc13-tests/tests/test/dependencies-c/master
    branches/gsoc13-tests/tests/test/dependencies-d/master
    branches/gsoc13-tests/tests/test/dependencies-e/error_expected
    branches/gsoc13-tests/tests/test/dependencies-e/master

Added: branches/gsoc13-tests/tests/test/dependencies-a/DESCRIPTION
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-a/DESCRIPTION	                        (rev 0)
+++ branches/gsoc13-tests/tests/test/dependencies-a/DESCRIPTION	2013-07-06 18:58:29 UTC (rev 107835)
@@ -0,0 +1,4 @@
+This test makes sure a dependency added in a variant block
+(this is selected as default variant) is considered.
+
+There is 1 test case.

Modified: branches/gsoc13-tests/tests/test/dependencies-a/test.tcl
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-a/test.tcl	2013-07-06 17:46:31 UTC (rev 107834)
+++ branches/gsoc13-tests/tests/test/dependencies-a/test.tcl	2013-07-06 18:58:29 UTC (rev 107835)
@@ -3,35 +3,26 @@
 
 source [file dirname $argv0]/../library.tcl
 
-set file "output"
-set dir "work"
+makeFile "" $output_file
+makeDirectory $work_dir
 set path [file dirname [file normalize $argv0]]
 
 proc dep-a {} {
-    global file
     global path
+    global output_file
 
-    load_variables $path
-    set_dir
-    port_index
-    port_clean $path
-    port_run $path
+    initial_setup
 
     set err "error*"
-    set line [get_line $file $err]
+    set line [get_line $output_file $err]
     return $line
 }
 
 test dependencies-a {
     Regression test for dependencies-a.
-} -constraints {
-    root
 } -body {
     dep-a
 } -result -1
 
 cleanup
-removeFile $file
-removeDirectory $dir
-
 cleanupTests

Added: branches/gsoc13-tests/tests/test/dependencies-b/DESCRIPTION
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-b/DESCRIPTION	                        (rev 0)
+++ branches/gsoc13-tests/tests/test/dependencies-b/DESCRIPTION	2013-07-06 18:58:29 UTC (rev 107835)
@@ -0,0 +1,4 @@
+This test does nothing. (or: ensures a port without dependencies really
+doesn't have any)
+
+There is 1 test case.

Modified: branches/gsoc13-tests/tests/test/dependencies-b/test.tcl
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-b/test.tcl	2013-07-06 17:46:31 UTC (rev 107834)
+++ branches/gsoc13-tests/tests/test/dependencies-b/test.tcl	2013-07-06 18:58:29 UTC (rev 107835)
@@ -3,35 +3,27 @@
 
 source [file dirname $argv0]/../library.tcl
 
-set file "output"
-set dir "work"
+makeFile "" $output_file
+makeDirectory $work_dir
 set path [file dirname [file normalize $argv0]]
 
 proc dep-b {} {
-    global file
     global path
+    global output_file
 
-    load_variables $path
-    set_dir
-    port_index
-    port_clean $path
-    port_run $path
+    initial_setup
 
     set err "error*"
-    set line [get_line $file $err]
+    set line [get_line $output_file $err]
     return $line
 }
 
 test dependencies-b {
     Regression test for dependencies-b.
-} -constraints {
-    root
 } -body {
     dep-b
 } -result -1
 
-cleanup
-removeFile $file
-removeDirectory $dir
 
+cleanup
 cleanupTests

Added: branches/gsoc13-tests/tests/test/dependencies-c/DESCRIPTION
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-c/DESCRIPTION	                        (rev 0)
+++ branches/gsoc13-tests/tests/test/dependencies-c/DESCRIPTION	2013-07-06 18:58:29 UTC (rev 107835)
@@ -0,0 +1,4 @@
+This test does the same as dependencies-a, but due to the transitive
+nature of dependencies, also tests what dependencies-a has already tested.
+
+There is 1 test case.

Deleted: branches/gsoc13-tests/tests/test/dependencies-c/master
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-c/master	2013-07-06 17:46:31 UTC (rev 107834)
+++ branches/gsoc13-tests/tests/test/dependencies-c/master	2013-07-06 18:58:29 UTC (rev 107835)
@@ -1,26 +0,0 @@
---->  Computing dependencies for dependencies-c
---->  Dependencies to be installed: dependencies-a dependencies-b
---->  Fetching distfiles for dependencies-b
---->  Verifying checksums for dependencies-b
---->  Extracting dependencies-b
---->  Configuring dependencies-b
---->  Building dependencies-b
---->  Staging dependencies-b into destroot
---->  Installing dependencies-b @1_0
---->  Activating dependencies-b @1_0
---->  Cleaning dependencies-b
---->  Fetching distfiles for dependencies-a
---->  Verifying checksums for dependencies-a
---->  Extracting dependencies-a
---->  Configuring dependencies-a
---->  Building dependencies-a
---->  Staging dependencies-a into destroot
---->  Installing dependencies-a @1_0+i_want_b
---->  Activating dependencies-a @1_0+i_want_b
---->  Cleaning dependencies-a
---->  Fetching distfiles for dependencies-c
---->  Verifying checksums for dependencies-c
---->  Extracting dependencies-c
---->  Configuring dependencies-c
---->  Building dependencies-c
---->  Testing dependencies-c

Modified: branches/gsoc13-tests/tests/test/dependencies-c/test.tcl
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-c/test.tcl	2013-07-06 17:46:31 UTC (rev 107834)
+++ branches/gsoc13-tests/tests/test/dependencies-c/test.tcl	2013-07-06 18:58:29 UTC (rev 107835)
@@ -3,35 +3,27 @@
 
 source [file dirname $argv0]/../library.tcl
 
-set file "output"
-set dir "work"
+makeFile "" $output_file
+makeDirectory $work_dir
 set path [file dirname [file normalize $argv0]]
 
 proc dep-c {} {
-    global file
     global path
+    global output_file
 
-    load_variables $path
-    set_dir
-    port_index
-    port_clean $path
-    port_run $path
+    initial_setup
 
     set err "error*"
-    set line [get_line $file $err]
+    set line [get_line $output_file $err]
     return $line
 }
 
 test dependencies-c {
     Regression test for dependencies-c.
-} -constraints {
-    root
 } -body {
     dep-c
 } -result -1
 
-cleanup
-removeFile $file
-removeDirectory $dir
 
+cleanup
 cleanupTests

Added: branches/gsoc13-tests/tests/test/dependencies-d/DESCRIPTION
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-d/DESCRIPTION	                        (rev 0)
+++ branches/gsoc13-tests/tests/test/dependencies-d/DESCRIPTION	2013-07-06 18:58:29 UTC (rev 107835)
@@ -0,0 +1,4 @@
+This test checks for an invalid dependency specification. The "depends" option
+tested in this test apparently was never implemented.
+
+There is 1 test case.

Deleted: branches/gsoc13-tests/tests/test/dependencies-d/master
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-d/master	2013-07-06 17:46:31 UTC (rev 107834)
+++ branches/gsoc13-tests/tests/test/dependencies-d/master	2013-07-06 18:58:29 UTC (rev 107835)
@@ -1,28 +0,0 @@
-Warning: depends option is not handled yet
-Warning: depends option is not handled yet
---->  Computing dependencies for dependencies-d
---->  Dependencies to be installed: dependencies-a dependencies-b
---->  Fetching distfiles for dependencies-b
---->  Verifying checksums for dependencies-b
---->  Extracting dependencies-b
---->  Configuring dependencies-b
---->  Building dependencies-b
---->  Staging dependencies-b into destroot
---->  Installing dependencies-b @1_0
---->  Activating dependencies-b @1_0
---->  Cleaning dependencies-b
---->  Fetching distfiles for dependencies-a
---->  Verifying checksums for dependencies-a
---->  Extracting dependencies-a
---->  Configuring dependencies-a
---->  Building dependencies-a
---->  Staging dependencies-a into destroot
---->  Installing dependencies-a @1_0+i_want_b
---->  Activating dependencies-a @1_0+i_want_b
---->  Cleaning dependencies-a
---->  Fetching distfiles for dependencies-d
---->  Verifying checksums for dependencies-d
---->  Extracting dependencies-d
---->  Configuring dependencies-d
---->  Building dependencies-d
---->  Testing dependencies-d

Modified: branches/gsoc13-tests/tests/test/dependencies-d/test.tcl
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-d/test.tcl	2013-07-06 17:46:31 UTC (rev 107834)
+++ branches/gsoc13-tests/tests/test/dependencies-d/test.tcl	2013-07-06 18:58:29 UTC (rev 107835)
@@ -3,35 +3,27 @@
 
 source [file dirname $argv0]/../library.tcl
 
-set file "output"
-set dir "work"
+makeFile "" $output_file
+makeDirectory $work_dir
 set path [file dirname [file normalize $argv0]]
 
 proc dep-d {} {
-    global file
     global path
+    global output_file
 
-    load_variables $path
-    set_dir
-    port_index
-    port_clean $path
-    port_run $path
+    initial_setup
 
     set err "error*"
-    set line [get_line $file $err]
+    set line [get_line $output_file $err]
     return $line
 }
 
 test dependencies-d {
     Regression test for dependencies-d.
-} -constraints {
-    root
 } -body {
     dep-d
 } -result -1
 
-cleanup
-removeFile $file
-removeDirectory $dir
 
+cleanup
 cleanupTests

Added: branches/gsoc13-tests/tests/test/dependencies-e/DESCRIPTION
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-e/DESCRIPTION	                        (rev 0)
+++ branches/gsoc13-tests/tests/test/dependencies-e/DESCRIPTION	2013-07-06 18:58:29 UTC (rev 107835)
@@ -0,0 +1,4 @@
+This test checks whether unknown dependencies correctly fail. There should be
+an error saying that the requested dependencies do not exist.
+
+There is 1 test case.

Deleted: branches/gsoc13-tests/tests/test/dependencies-e/error_expected
===================================================================
Deleted: branches/gsoc13-tests/tests/test/dependencies-e/master
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-e/master	2013-07-06 17:46:31 UTC (rev 107834)
+++ branches/gsoc13-tests/tests/test/dependencies-e/master	2013-07-06 18:58:29 UTC (rev 107835)
@@ -1,5 +0,0 @@
---->  Computing dependencies for dependencies-e
-Error: Dependency 'docbook-xml-4.1.2' not found.
-To report a bug, follow the instructions in the guide:
-    http://guide.macports.org/#project.tickets
-Error: Processing of port dependencies-e failed

Modified: branches/gsoc13-tests/tests/test/dependencies-e/test.tcl
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-e/test.tcl	2013-07-06 17:46:31 UTC (rev 107834)
+++ branches/gsoc13-tests/tests/test/dependencies-e/test.tcl	2013-07-06 18:58:29 UTC (rev 107835)
@@ -3,35 +3,27 @@
 
 source [file dirname $argv0]/../library.tcl
 
-set file "output"
-set dir "work"
+makeFile "" $output_file
+makeDirectory $work_dir
 set path [file dirname [file normalize $argv0]]
 
 proc dep-e {} {
-    global file
     global path
+    global output_file
 
-    load_variables $path
-    set_dir
-    port_index
-    port_clean $path
-    port_run $path
+    initial_setup
 
     set err "error: dependency 'docbook-xml-4.1.2' not found*"
-    set line [get_line $file $err]
+    set line [get_line $output_file $err]
     return $line
 }
 
 test dependencies-e {
     Regression test for dependencies-e.
-} -constraints {
-    root
 } -body {
     dep-e
 } -result "error: dependency 'docbook-xml-4.1.2' not found."
 
-cleanup
-removeFile $file
-removeDirectory $dir
 
+cleanup
 cleanupTests
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130706/aa418d7b/attachment-0001.html>


More information about the macports-changes mailing list