[Lsb-messages] /var/www/bzr/lsb/devel/distribution-checker r68: Pull the tcl tests from lsb-tcl rather than the tarball for 5.0+ (bug 3240)

[Stew Benedict]

------------------------------------------------------------
revno: 68
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: distribution-checker
timestamp: Wed 2012-05-23 16:21:03 -0400
message:
  Pull the tcl tests from lsb-tcl rather than the tarball for 5.0+ (bug 3240)
modified:
  package/Makefile
  utils/Tests/Tcl_test.pm
  utils/Tests/templates/Tcl_test.mnf.tpl
-------------- next part --------------
=== modified file 'package/Makefile'
--- a/package/Makefile	2012-05-06 14:38:00 +0000
+++ b/package/Makefile	2012-05-23 20:21:03 +0000
@@ -8,7 +8,7 @@
 else
 	VERSION=$(VERSION_LSB)
 endif
-RELEASE=1
+RELEASE=2
 
 PROBLEM_DB_URL=http://ftp.linuxfoundation.org/pub/lsb/updates/dist-checker-data/problem_db2
 

=== modified file 'utils/Tests/Tcl_test.pm'
--- a/utils/Tests/Tcl_test.pm	2009-07-29 15:57:36 +0000
+++ b/utils/Tests/Tcl_test.pm	2012-05-23 20:21:03 +0000
@@ -46,15 +46,21 @@
 	# Create temporary directory
 	is_ok $self->create_temp_dir()
 		or return error "Failed to create temporary directory.", $Error::Last;
-	
-	# Copy test data file to the temporary directory
-	is_ok $self->copy_files_from_reqs_to( $self->temp_dir )
-		or return error "Failed to prepare test data file.", $Error::Last;
-	
-	# Unpack the test data file.
-	cmd("cd ".shq($self->temp_dir)." && tar xvf tcl*-tests.tar >/dev/null") == 0
-		or return error "Failed to unpack test data tarball.", $Error::Last;
-	
+
+	if ( version_filter("LSB < 5.0", $globals->{'standard'}) ) {
+		# Copy test data file to the temporary directory
+		is_ok $self->copy_files_from_reqs_to( $self->temp_dir )
+			or return error "Failed to prepare test data file.", $Error::Last;
+	
+		# Unpack the test data file.
+		cmd("cd ".shq($self->temp_dir)." && tar xvf tcl*-tests.tar >/dev/null") == 0
+			or return error "Failed to unpack test data tarball.", $Error::Last;
+	} else {
+		# Use the test files from the package
+		cmd("cd ".shq($self->temp_dir)." && cp -ar /opt/lsb/appbat/lib/tcl/tests/* . >/dev/null") == 0
+			or return error "Failed to copy test data.", $Error::Last;
+	}
+
 	# Check the unpacked files
 	( -f $self->temp_dir."/all.tcl" )
 		or return error "Failed to unpack test data tarball or tarball is wrong."; 

=== modified file 'utils/Tests/templates/Tcl_test.mnf.tpl'
--- a/utils/Tests/templates/Tcl_test.mnf.tpl	2012-04-20 11:38:51 +0000
+++ b/utils/Tests/templates/Tcl_test.mnf.tpl	2012-05-23 20:21:03 +0000
@@ -67,13 +67,10 @@
 	lsb-tcl			*
 
 TESTSUITE tcl	*	LSB 5.0 beta
-	tcl-tests.tar		<tests>
 	lsb-tcl				*	<appbat-5.0>
 
 TESTSUITE tcl	*	LSB 5.0	snapshot
-	tcl-tests.tar		<tests-snapshots>
 	lsb-tcl			*	<appbat-snapshots>
 
 TESTSUITE tcl	*	LSB 5.0	local
-	tcl-tests.tar		<tests-snapshots>
 	lsb-tcl			*