[107493] branches/gsoc13-tests/tests/test
marius at macports.org
marius at macports.org
Mon Jul 1 08:10:21 PDT 2013
Revision: 107493
https://trac.macports.org/changeset/107493
Author: marius at macports.org
Date: 2013-07-01 08:10:21 -0700 (Mon, 01 Jul 2013)
Log Message:
-----------
Change checksum and dependencies tests to use regex search and remove dir_set args.
Modified Paths:
--------------
branches/gsoc13-tests/tests/test/checksums-1/test.tcl
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
Modified: branches/gsoc13-tests/tests/test/checksums-1/test.tcl
===================================================================
--- branches/gsoc13-tests/tests/test/checksums-1/test.tcl 2013-07-01 15:07:52 UTC (rev 107492)
+++ branches/gsoc13-tests/tests/test/checksums-1/test.tcl 2013-07-01 15:10:21 UTC (rev 107493)
@@ -7,10 +7,17 @@
set dir "work"
set path [file dirname [file normalize $argv0]]
+# Initial setup
+load_variables $path
+set_dir
+port_index
+port_clean $path
+port_run $path
+
# Useful procs
proc get_md5 {filename} {
global path
- set md5 "debug: calculated (md5)"
+ set md5 "debug: calculated (md5)*"
set line [get_line $path/$filename $md5]
set result [lrange [split $line " "] 4 4]
@@ -21,7 +28,7 @@
proc get_sha {filename} {
global path
- set sha "debug: calculated (sha1)"
+ set sha "debug: calculated (sha1)*"
set line [get_line $path/$filename $sha]
set result [lrange [split $line " "] 4 4]
@@ -32,7 +39,7 @@
proc get_rmd {filename} {
global path
- set sha "debug: calculated (rmd160)"
+ set sha "debug: calculated (rmd160)*"
set line [get_line $path/$filename $sha]
set result [lrange [split $line " "] 4 4]
@@ -40,11 +47,6 @@
return $result
}
-# Initial setup
-load_variables $path
-port_clean $path
-port_run $path
-
# Test cases
test md5_checksum {
Regression test for MD5 Checksum.
Modified: branches/gsoc13-tests/tests/test/dependencies-a/test.tcl
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-a/test.tcl 2013-07-01 15:07:52 UTC (rev 107492)
+++ branches/gsoc13-tests/tests/test/dependencies-a/test.tcl 2013-07-01 15:10:21 UTC (rev 107493)
@@ -12,12 +12,12 @@
global path
load_variables $path
- set_dir $path
+ set_dir
port_index
port_clean $path
port_run $path
- set err "error"
+ set err "error*"
set line [get_line $file $err]
return $line
}
Modified: branches/gsoc13-tests/tests/test/dependencies-b/test.tcl
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-b/test.tcl 2013-07-01 15:07:52 UTC (rev 107492)
+++ branches/gsoc13-tests/tests/test/dependencies-b/test.tcl 2013-07-01 15:10:21 UTC (rev 107493)
@@ -12,12 +12,12 @@
global path
load_variables $path
- set_dir $path
+ set_dir
port_index
port_clean $path
port_run $path
- set err "error"
+ set err "error*"
set line [get_line $file $err]
return $line
}
Modified: branches/gsoc13-tests/tests/test/dependencies-c/test.tcl
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-c/test.tcl 2013-07-01 15:07:52 UTC (rev 107492)
+++ branches/gsoc13-tests/tests/test/dependencies-c/test.tcl 2013-07-01 15:10:21 UTC (rev 107493)
@@ -12,12 +12,12 @@
global path
load_variables $path
- set_dir $path
+ set_dir
port_index
port_clean $path
port_run $path
- set err "error"
+ set err "error*"
set line [get_line $file $err]
return $line
}
Modified: branches/gsoc13-tests/tests/test/dependencies-d/test.tcl
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-d/test.tcl 2013-07-01 15:07:52 UTC (rev 107492)
+++ branches/gsoc13-tests/tests/test/dependencies-d/test.tcl 2013-07-01 15:10:21 UTC (rev 107493)
@@ -12,12 +12,12 @@
global path
load_variables $path
- set_dir $path
+ set_dir
port_index
port_clean $path
port_run $path
- set err "error"
+ set err "error*"
set line [get_line $file $err]
return $line
}
Modified: branches/gsoc13-tests/tests/test/dependencies-e/test.tcl
===================================================================
--- branches/gsoc13-tests/tests/test/dependencies-e/test.tcl 2013-07-01 15:07:52 UTC (rev 107492)
+++ branches/gsoc13-tests/tests/test/dependencies-e/test.tcl 2013-07-01 15:10:21 UTC (rev 107493)
@@ -12,12 +12,12 @@
global path
load_variables $path
- set_dir $path
+ set_dir
port_index
port_clean $path
port_run $path
- set err "error: dependency 'docbook-xml-4.1.2' not found"
+ set err "error: dependency 'docbook-xml-4.1.2' not found*"
set line [get_line $file $err]
return $line
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130701/e28c7a98/attachment-0001.html>
More information about the macports-changes
mailing list