[Lsb-messages] /var/www/bzr/lsb/devel/appbat r961: Package the tcl tests as part of lsb-tcl (bug 3240)

Stew Benedict stewb at linux-foundation.org
Wed May 23 19:50:57 UTC 2012


------------------------------------------------------------
revno: 961
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: appbat
timestamp: Wed 2012-05-23 15:50:57 -0400
message:
  Package the tcl tests as part of lsb-tcl (bug 3240)
added:
  patches/tcl8.5.9-tests.patch
modified:
  extras/md5sums
  patches/tcl8.5.9.patch
  rpm/lsb-tcl.spec
-------------- next part --------------
=== modified file 'extras/md5sums'
--- a/extras/md5sums	2012-05-10 16:06:50 +0000
+++ b/extras/md5sums	2012-05-23 19:50:57 +0000
@@ -50,7 +50,8 @@
 a7a0e25c2ea2a179ed4204338ba7f285  xpaint-2.9.8.2.patch
 65aa360ca135a55825185c1c3e94dad1  samba-3.5.9.patch
 d01d3602977ca2c8dbfcb406d9542625  rsync-3.0.8.patch
-b038d8187627f273217c8417e78fbb82  tcl8.5.9.patch
+e7d90ae68bfa83a9e65e4d4654f5f6da  tcl8.5.9.patch
+e6fa69f97241f2daff6cd4e013a2420e  tcl8.5.9-tests.patch
 2fc99a169ee0f6a493780eb14a7e5188  tcl8.5.1-expect.patch
 8512d8db3233041dd68a81476906012a  tcl8.5.9-src.tar.gz
 7cdeb9feb61593f58a0ae61f2497580e  tk8.5.9-src.tar.gz

=== added file 'patches/tcl8.5.9-tests.patch'
--- a/patches/tcl8.5.9-tests.patch	1970-01-01 00:00:00 +0000
+++ b/patches/tcl8.5.9-tests.patch	2012-05-23 19:50:57 +0000
@@ -0,0 +1,105 @@
+--- ./tests/stringObj.test.lsb-test	2009-03-30 13:47:30.000000000 -0400
++++ ./tests/stringObj.test	2012-05-23 10:09:02.112172450 -0400
+@@ -160,7 +160,7 @@ test stringObj-6.8 {Tcl_AppendStringsToO
+     teststringobj appendstrings 1 {}
+     list [teststringobj length2 1] [teststringobj get 1]
+ } {0 {}}
+-test stringObj-6.9 {Tcl_AppendStringToObj, pure unicode} {
++test stringObj-6.9 {Tcl_AppendStringToObj, pure unicode} testobj {
+     testobj freeallvars
+     teststringobj set2 1 [string replace abc 1 1 d]
+     teststringobj appendstrings 1 foo bar soom
+@@ -434,35 +434,35 @@ test stringObj-14.1 {Tcl_SetObjLength on
+     teststringobj get 1
+ } {bar}
+ 
+-test stringObj-15.1 {Tcl_Append*ToObj: self appends} {
++test stringObj-15.1 {Tcl_Append*ToObj: self appends} testobj {
+     teststringobj set 1 foo
+     teststringobj appendself 1 0
+ } foofoo
+-test stringObj-15.2 {Tcl_Append*ToObj: self appends} {
++test stringObj-15.2 {Tcl_Append*ToObj: self appends} testobj {
+     teststringobj set 1 foo
+     teststringobj appendself 1 1
+ } foooo
+-test stringObj-15.3 {Tcl_Append*ToObj: self appends} {
++test stringObj-15.3 {Tcl_Append*ToObj: self appends} testobj {
+     teststringobj set 1 foo
+     teststringobj appendself 1 2
+ } fooo
+-test stringObj-15.4 {Tcl_Append*ToObj: self appends} {
++test stringObj-15.4 {Tcl_Append*ToObj: self appends} testobj {
+     teststringobj set 1 foo
+     teststringobj appendself 1 3
+ } foo
+-test stringObj-15.5 {Tcl_Append*ToObj: self appends} {
++test stringObj-15.5 {Tcl_Append*ToObj: self appends} testobj {
+     teststringobj set 1 foo
+     teststringobj appendself2 1 0
+ } foofoo
+-test stringObj-15.6 {Tcl_Append*ToObj: self appends} {
++test stringObj-15.6 {Tcl_Append*ToObj: self appends} testobj {
+     teststringobj set 1 foo
+     teststringobj appendself2 1 1
+ } foooo
+-test stringObj-15.7 {Tcl_Append*ToObj: self appends} {
++test stringObj-15.7 {Tcl_Append*ToObj: self appends} testobj {
+     teststringobj set 1 foo
+     teststringobj appendself2 1 2
+ } fooo
+-test stringObj-15.8 {Tcl_Append*ToObj: self appends} {
++test stringObj-15.8 {Tcl_Append*ToObj: self appends} testobj {
+     teststringobj set 1 foo
+     teststringobj appendself2 1 3
+ } foo
+--- ./tests/env.test.lsb-test	2012-05-23 10:06:46.436172393 -0400
++++ ./tests/env.test	2012-05-23 10:03:31.542172310 -0400
+@@ -80,7 +80,7 @@ set printenvScript [makeFile {
+ 	TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH PURE_PROG_NAME DISPLAY
+ 	SHLIB_PATH SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH
+ 	DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING
+-	__CF_USER_TEXT_ENCODING SECURITYSESSIONID LANG WINDIR TERM
++	__CF_USER_TEXT_ENCODING SECURITYSESSIONID
+     } {
+ 	lrem names $name
+     }
+@@ -112,7 +112,7 @@ foreach name [array names env] {
+ 	    TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH DISPLAY SHLIB_PATH
+ 	    SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH
+ 	    DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING
+-	    SECURITYSESSIONID LANG WINDIR TERM
++	    SECURITYSESSIONID
+     }} {
+ 	unset env($name)
+     }
+--- ./tests/README.stringObj.lsb-test	2012-05-23 10:07:16.945172406 -0400
++++ ./tests/README.stringObj	2012-05-23 10:06:12.820172390 -0400
+@@ -0,0 +1,20 @@
++12/1/2009 Stew Benedict <stewb at linux-foundation.org>
++
++8.5.7 added 9 tests to stringObj.test. These tests fail consistently
++using the test method outlined in the LSB appbat FVT, while they pass
++using "make test" in the build, which uses the tcltest binary.
++I noted that all the new tests fail to pass the "testobj" into the test,
++so this version is patched to do so, which seems to allow them to pass
++using the LSB test method.
++
++Failing tests:
++==== stringObj-6.9 FAILED
++==== stringObj-15.1 FAILED
++==== stringObj-15.2 FAILED
++==== stringObj-15.3 FAILED
++==== stringObj-15.4 FAILED
++==== stringObj-15.5 FAILED
++==== stringObj-15.6 FAILED
++==== stringObj-15.7 FAILED
++==== stringObj-15.8 FAILED
++
+--- ./tests/README.env.lsb-test	2012-05-23 10:07:09.952172420 -0400
++++ ./tests/README.env	2012-05-23 10:06:12.561172381 -0400
+@@ -0,0 +1,4 @@
++8.5.9 added 3 environment variables: LANG WINDIR TERM to env.test
++The tests are run with LC_ALL=C under dist-checker and these tests fail,
++so they are removed by the patch (bug 3493)
++

=== modified file 'patches/tcl8.5.9.patch'
--- a/patches/tcl8.5.9.patch	2012-04-25 16:16:19 +0000
+++ b/patches/tcl8.5.9.patch	2012-05-23 19:50:57 +0000
@@ -5,12 +5,6 @@
 
      Fix a problem where tcl doesn't count number of test files correctly.
 
-- tests/env.test
-
-     Drop LANG WINDIR TERM - fail when we set LC_ALL=C (bug 3493)
-     This does not go into the package, but the test tarball on ftp,
-     just captured here for reference
-
 - Note:
 
      We've also dropped httpold.test in the test tarballs (bug 2861)
@@ -25,23 +19,3 @@
  	if {$currentFailure \
  		&& ([lsearch -exact $failFiles $testFileName] == -1)} {
  	    lappend failFiles $testFileName
---- tcl8.5.9/tests/env.test.lsbcc	2012-04-25 10:37:04.017793548 -0400
-+++ tcl8.5.9/tests/env.test	2012-04-25 10:37:24.877793560 -0400
-@@ -80,7 +80,7 @@ set printenvScript [makeFile {
- 	TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH PURE_PROG_NAME DISPLAY
- 	SHLIB_PATH SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH
- 	DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING
--	__CF_USER_TEXT_ENCODING SECURITYSESSIONID LANG WINDIR TERM
-+	__CF_USER_TEXT_ENCODING SECURITYSESSIONID
-     } {
- 	lrem names $name
-     }
-@@ -112,7 +112,7 @@ foreach name [array names env] {
- 	    TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH DISPLAY SHLIB_PATH
- 	    SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH
- 	    DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING
--	    SECURITYSESSIONID LANG WINDIR TERM
-+	    SECURITYSESSIONID
-     }} {
- 	unset env($name)
-     }

=== modified file 'rpm/lsb-tcl.spec'
--- a/rpm/lsb-tcl.spec	2012-05-10 10:44:19 +0000
+++ b/rpm/lsb-tcl.spec	2012-05-23 19:50:57 +0000
@@ -10,7 +10,7 @@
 Summary: An embeddable scripting language.
 Name: lsb-tcl
 Version: %{tcl_ver}
-Release: 4.lsb5
+Release: 5.lsb5
 Vendor: Linux Foundation
 Packager: Appbat Team <lsb-appbat at linux-foundation.org>
 License: BSD
@@ -24,11 +24,12 @@
 Source0: http://easynews.dl.sourceforge.net/sourceforge/tcl/tcl%{tcl_ver}-src.tar.gz
 Source1: http://easynews.dl.sourceforge.net/sourceforge/tk/tk%{tk_ver}-src.tar.gz
 Source2: http://expect.nist.gov/src/expect-%{expect_ver}.tar.gz
-Patch0: tcl8.5.9.patch
+Patch0: tcl%{tcl_ver}.patch
 Patch1: tcl8.5.1-expect.patch
 Patch2: tk%{tk_ver}.patch
 Patch3: expect-%{expect_minor}.patch
 Patch4: expect-tcl8.5.patch
+Patch5: tcl%{tcl_ver}-tests.patch
 
 %description
 LSB conforming version of tcl.  Tcl is a simple scripting language
@@ -62,6 +63,7 @@
 cd tcl%{tcl_ver}
 %patch0 -p1 -b .lsbcc
 %patch1 -p1 -b .tcl-expect
+%patch5 -p0 -b .lsb-test
 cd ..
 cd tk%{tk_ver}
 %patch2 -p1 -b .lsbcc
@@ -190,7 +192,7 @@
 make -C expect-%{expect_minor} INSTALL_ROOT=%{buildroot} install-binaries install-libraries
 
 # make READMEs about the patches
-for patch in %{PATCH0} %{PATCH1} %{PATCH2}; do 
+for patch in %{PATCH0} %{PATCH1} %{PATCH2} %{PATCH5}; do 
   COUNT=`grep -n '\-\-\-' $patch | head -1 | awk -F\: '{print $1}'`
   if [ "$COUNT" -gt 1 ];then
     COUNT=`expr $COUNT - 1`
@@ -216,6 +218,11 @@
   rm -fr  %{buildroot}/%{app_prefix}/lib64/tk%{tk_minor}
 fi
 
+# trim/install our tests
+rm -f tcl%{tcl_ver}/tests/*.lsb-test
+rm -f tcl%{tcl_ver}/tests/httpold.test
+cp -ar tcl%{tcl_ver}/tests %{buildroot}/%{app_prefix}/lib/tcl%{tcl_minor}
+
 %pre
 
 %post
@@ -275,6 +282,9 @@
 %{sharedir}/doc/README.LSB.expect.build.patches
 
 %changelog
+* Wed May 23 2012 Stew Benedict <stewb at linux-foundation.org>
+- Bundle the patched tcl tests in the package (P5, bug 3240)
+
 * Wed Jun 15 2011 Stew Benedict <stewb at linux-foundation.org>
 - bump to tcl/tk to 8.5.9, re-diff P2, add hunk for bug 3260
 



More information about the lsb-messages mailing list