ooo-build r14960 - in trunk: . patches/dev300 patches/unittesting
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14960 - in trunk: . patches/dev300 patches/unittesting
- Date: Mon, 29 Dec 2008 21:31:41 +0000 (UTC)
Author: kyoshida
Date: Mon Dec 29 21:31:41 2008
New Revision: 14960
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14960&view=rev
Log:
2008-12-29 Kohei Yoshida <kyoshida novell com>
* patches/unittesting/unittesting-build-pl-m37.diff:
* patches/unittesting/unittesting-build-pl.diff:
* patches/dev300/apply: adjusted for dev300-m38.
Added:
trunk/patches/unittesting/unittesting-build-pl-m37.diff
- copied unchanged from r14946, /trunk/patches/unittesting/unittesting-build-pl.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/unittesting/unittesting-build-pl.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Mon Dec 29 21:31:41 2008
@@ -2377,9 +2377,15 @@
SectionIssue => i#87469
# FIXME: file more issuses when ready
+[ UnitTesting < dev300-m38 ]
+# teach build.pl what to do with prj/tests.lst's
+unittesting-build-pl-m37.diff
+
+[ UnitTesting >= dev300-m38 ]
# teach build.pl what to do with prj/tests.lst's
unittesting-build-pl.diff
+[ UnitTesting ]
# the tests
unittesting-basebmp.diff
unittesting-basegfx.diff
Modified: trunk/patches/unittesting/unittesting-build-pl.diff
==============================================================================
--- trunk/patches/unittesting/unittesting-build-pl.diff (original)
+++ trunk/patches/unittesting/unittesting-build-pl.diff Mon Dec 29 21:31:41 2008
@@ -1,16 +1,19 @@
---- solenv/bin/build.pl 2007-09-05 14:43:32.000000000 +0200
-+++ solenv/bin/build.pl 2007-09-06 17:27:42.000000000 +0200
-@@ -194,6 +194,9 @@
- # the server considered as an error/client crash
+diff --git solenv/bin/build.pl solenv/bin/build.pl
+index d9e862a..d4084b9 100644
+--- solenv/bin/build.pl
++++ solenv/bin/build.pl
+@@ -196,6 +196,10 @@
my %lost_client_jobs = (); # hash containing lost jobs
my %job_jobdir = (); # hash containing job-dir pairs
+ my $is_svn = 0;
+
+ $unit_tests = 0; # use tests.lst in addition to build.lst & build with 'dmake check' there - for unit testing
+ %unit_tests_dirs; # directories that should be built with 'dmake check'
-
++
### main ###
-@@ -494,21 +497,25 @@ sub dmake_dir {
+ get_options();
+@@ -503,7 +507,11 @@ sub dmake_dir {
};
RemoveFromDependencies($BuildDir, \%LocalDepsHash) if (!$child);
return if ($cmd_file || $show);
@@ -23,23 +26,26 @@
# chdir $BuildDir;
# getcwd();
# if ($html) {
- # my $log_file = $jobs_hash{$BuildDir}->{LONG_LOG_PATH};
- # my $log_dir = File::Basename::dirname($log_file);
+@@ -512,14 +520,14 @@ sub dmake_dir {
# if (!-d $log_dir) {
# system("$perl $mkout");
# };
-# $error_code = system ("$dmake > $log_file 2>&1");
+-# if (!$grab_output && -f $log_file) {
+# $error_code = system ("$dmake $dmake_check > $log_file 2>&1");
- # if (!$grab_output && -f $log_file) {
++# if (!$grab_output && -f $log_file) {
# system("cat $log_file");
# };
# } else {
-# $error_code = system ("$dmake");
+# $error_code = system ("$dmake $dmake_check");
# };
-
+-
++
html_store_job_info(\%LocalDepsHash, $BuildDir, $error_code) if (!$child);
-@@ -545,8 +552,27 @@ sub store_build_list_content {
+ };
+ if ($error_code && $ignore) {
+@@ -562,8 +570,27 @@ sub store_build_list_content {
} else {
if (open (BUILD_LST, $build_list_path)) {
my @build_lst = <BUILD_LST>;
@@ -68,15 +74,15 @@
return;
}
$dead_parents{$module}++;
-@@ -1236,6 +1262,7 @@ sub get_options {
- push (@dmake_args, get_job_args()) if (!$custom_job);
+@@ -1286,6 +1313,7 @@ sub get_options {
+ push (@dmake_args, get_dmake_args()) if (!$custom_job);
next;
};
+ $arg =~ /^check$/ and $unit_tests = 1 and next; # it's a dmake target, but we strip it here to add it later
push (@dmake_args, $arg);
};
if (!$html) {
-@@ -1290,6 +1317,10 @@ sub get_job_args {
+@@ -1347,6 +1375,10 @@ sub get_dmake_args {
my @job_args = ();
while ($arg = shift @ARGV) {
next if ($arg =~ /^--$/);
@@ -87,9 +93,11 @@
push (@job_args, $arg);
};
return @job_args;
---- solenv/inc/target.mk 18 Jul 2007 08:01:14 -0000 1.201
-+++ solenv/inc/target.mk 6 Sep 2007 20:44:31 -0000
-@@ -2076,3 +2076,10 @@ $(SUBDIRS) .PHONY :
+diff --git solenv/inc/target.mk solenv/inc/target.mk
+index afb9580..614c10e 100644
+--- solenv/inc/target.mk
++++ solenv/inc/target.mk
+@@ -2080,3 +2080,10 @@ $(SUBDIRS) .PHONY :
# if the previous block was a rule or a target, "\#" isn't recognized
# as an escaped "#". if it was an assignment, escaping works...
some_unique_variable_name:=1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]