------------------------------------------------------------
revno: 2018
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Thu 2010-06-10 16:07:27 +0200
message:
fix smoketest (on armel)
added:
patches/fix-smoketest-without-java.diff
smoketest/
smoketest/patches/
smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
modified:
changelog
patches/series
rules
=== modified file 'changelog'
--- a/changelog 2010-06-06 15:05:24 +0000
+++ b/changelog 2010-06-10 14:07:27 +0000
@@ -2,14 +2,18 @@
* debian/patches/powerpc-fixes.diff: add powerpc fix and powerpcspe
support, thanks Sebastian Andrzej Siewior
+ * debian/patches/fix-smoketest-without-java.diff: disable tests which
+ need Java if Java is disabled
* debian/control.in:
- update Vcs-Bzr:
* debian/rules:
- - fix logic error; actually disable smoketest on armel only; not on
- all archs
+ - run smoketest for armel again (the logic was flawed anyway and
+ disabled smoketest for all archs)
+ * debian/smoketest/*, debian/rules: disable Databse{Insert,Delete,Seek} tests
+ on armel. No regression and works if used "correctly" inside OOo
- -- Rene Engelhard <[email protected]> Sun, 06 Jun 2010 17:01:41 +0200
+ -- Rene Engelhard <[email protected]> Wed, 09 Jun 2010 01:19:22 +0200
openoffice.org (1:3.2.1-1) unstable; urgency=medium
=== added file 'patches/fix-smoketest-without-java.diff'
--- a/patches/fix-smoketest-without-java.diff 1970-01-01 00:00:00 +0000
+++ b/patches/fix-smoketest-without-java.diff 2010-06-10 14:07:27 +0000
@@ -0,0 +1,39 @@
+--- /dev/null 2010-05-24 16:58:35.275686347 +0200
++++
openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/fix-smoketest-without-java.diff
2010-06-08 15:21:36.000000000 +0200
+@@ -0,0 +1,22 @@
++diff --git a/smoketestoo_native/data/scripts/Global.xba
b/smoketestoo_native/data/scripts/Global.xba
++--- smoketestoo_native/data/scripts/Global.xba
+++++ smoketestoo_native/data/scripts/Global.xba
++@@ -546,9 +546,15 @@
++ bMakeHTMLTest = true
++ bMakeMathTest = true
++ bMakeChartTest = true
++- bMakeJavaTest = true
++- bMakeDBTest = true
++- bMakeExtensionTest = true
+++ if Environ("SOLAR_JAVA") = "NO" then
+++ bMakeJavaTest = false
+++ bMakeDBTest = false
+++ bMakeExtensionTest = false
+++ else
+++ bMakeJavaTest = true
+++ bMakeDBTest = true
+++ bMakeExtensionTest = true
+++ End If
++ bMakeSaveOpenXMLTest = true
++ REM Disable StarOffice 5.0 tests in case binfilter has not been included
++ if Environ("WITH_BINFILTER") = "NO" then
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index 3a732ae..f4ceb02 100644
+--- openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
++++ openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
+@@ -506,6 +506,9 @@ sfx2-check-existing-template-dirs.diff, i#100518, pmladek
+ # FIXME: temporarily disabled as this causes a race condition in calc's cell
format dialog.
+ #vcl-kerning-fix.diff, n#464436, i#26519, cbosdo
+
++# don't run stuff needing Java in smoketest when built without Java
++fix-smoketest-without-java.diff, i#112212, rengelha
++
+ [ LinuxOnly ]
+ # fix that allows OOo to work with a standard (unpatched) libjpeg,
+ jpegc.c.diff, i#80674, n#272574, flr
=== modified file 'patches/series'
--- a/patches/series 2010-06-05 16:29:48 +0000
+++ b/patches/series 2010-06-10 14:07:27 +0000
@@ -3,3 +3,4 @@
fix-incorrect-automatic-print-area-assignment.diff
fix-save-performance-with-hidden-rows.diff
powerpc-fixes.diff
+fix-smoketest-without-java.diff
=== modified file 'rules'
--- a/rules 2010-06-06 15:05:24 +0000
+++ b/rules 2010-06-10 14:07:27 +0000
@@ -541,12 +541,6 @@
OOO_NPSOPLUGIN_ARCHS=
endif
-# error: Database: Database Insert record into Database -> error
-# but also already in older versions, so...
-ifeq "$(ARCH)" "armel"
- RUN_SMOKETEST=n
-endif
-
# builds long and is for legacy filters. probably not needed on {arm,mips}{,el}
ifneq (,$(findstring arm,$(ARCH)))
BUILD_BINFILTERS=n
@@ -2038,12 +2032,20 @@
endif
ifeq "$(RUN_SMOKETEST)" "y"
# smoketest
+ifeq "$(ARCH)" "armel"
+ cd $(SOURCE_TREE)/smoketestoo_native && \
+ patch -p1 <
$(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
+endif
cd $(SOURCE_TREE)/smoketestoo_native && \
. $(CURDIR)/$(SOURCE_TREE)/*.sh; \
export PATH=$(BUILD_PATH); \
export TMPDIR=`mktemp -q -d`; \
export JAVA_HOME=$(TEST_JAVA_HOME); \
SAL_USE_VCLPLUGIN="svp" ../solenv/bin/build.pl
+ifeq "$(ARCH)" "armel"
+ cd $(SOURCE_TREE)/smoketestoo_native && \
+ patch -p1 -R <
$(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
+endif
endif
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(RUN_API_TESTS)" "y"
=== added directory 'smoketest'
=== added directory 'smoketest/patches'
=== added file
'smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff'
--- a/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
1970-01-01 00:00:00 +0000
+++ b/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
2010-06-10 14:07:27 +0000
@@ -0,0 +1,68 @@
+diff --git a/smoketestoo_native/data/scripts/Test_DB.xba
b/smoketestoo_native/data/scripts/Test_DB.xba
+--- smoketestoo_native/data/scripts/Test_DB.xba
++++ smoketestoo_native/data/scripts/Test_DB.xba
+@@ -4,9 +4,6 @@
+
+ const cMessageDatabaseService = "Database Service"
+ const cMessageDatabaseOpen = "Open Database"
+-const cMessageDatabaseInsert = "Insert record into Database"
+-const cMessageDatabaseDelete = "Delete record from Database"
+-const cMessageDatabaseSeek = "Read other record from Database"
+ const cMessageDatabaseClose = "Close Database"
+
+ Sub TestDB (FilterType as Integer)
+@@ -61,54 +58,6 @@
+ SetStatus (FilterType, cDBService, not IsNull (oRowSet))
+ End If
+
+- nCurrentAction = cDBInsert
+- sCurrentMessage = cMessageDatabaseInsert
+-
+- oRowSet.ActiveConnection = oDBConnection
+-
+- oRowSet.CommandType = com.sun.star.sdb.CommandType.COMMAND
+- oRowSet.Command = "SELECT * FROM " + sTable
+- oRowSet.execute()
+-
+- oRowSet.moveToInsertRow
+- oRowSet.updateString(5, sTestString)
+-
+- oRowSet.insertRow()
+- nRowCount=oRowSet.RowCount
+-
+- oRowSet.moveToCurrentRow()
+-
+- bResult = (oRowSet.getString(5) = sTestString)
+- LogState (bResult, "Database "+ cMessageDatabaseInsert,
FileChannel)
+- LogState (bResult, "Database "+ cMessageDatabaseInsert,
MainFileChannel)
+- SetStatus (FilterType, cDBInsert, bResult)
+-
+- 'delete only if insert passed
+-
+- if (bResult) Then
+- nCurrentAction = cDBDelete
+- sCurrentMessage = cMessageDatabaseDelete
+- oRowSet.deleteRow()
+- bResult = (nRowCount - oRowSet.RowCount = 0)
+- if ( bResult ) Then
+- oRowSet.next()
+- bResult = (nRowCount - oRowSet.RowCount = 1)
+- End If
+- LogState (bResult, "Database "+
cMessageDatabaseDelete, FileChannel)
+- LogState (bResult, "Database "+
cMessageDatabaseDelete, MainFileChannel)
+- SetStatus (FilterType, cDBDelete, bResult)
+- End If
+-
+- ' read other record
+-
+- nCurrentAction = cDBSeek
+- sCurrentMessage = cMessageDatabaseSeek
+- oRowSet.first()
+- bResult = not (oRowSet.getString(5) = sTestString)
+- LogState (bResult, "Database "+ cMessageDatabaseSeek,
FileChannel)
+- LogState (bResult, "Database "+ cMessageDatabaseSeek,
MainFileChannel)
+- SetStatus (FilterType, cDBSeek, bResult)
+-
+ nCurrentAction = cDBClose
+ sCurrentMessage = cMessageDatabaseClose
+ oDBConnection.Dispose()
