[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:47:59 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d68f8b24321049c848794aab708ab1a773286044
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 28 23:56:01 2001 +0000
Adding qsortedlist to test harness
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@229 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/tests/qt/Makefile.in b/WebCore/kwq/tests/qt/Makefile.in
index a872762..6475a28 100644
--- a/WebCore/kwq/tests/qt/Makefile.in
+++ b/WebCore/kwq/tests/qt/Makefile.in
@@ -40,6 +40,7 @@ PROGRAMS = \
qdate-test \
qtime-test \
qdatetime-test \
+ qsortedlist-test \
$(NULL)
CLEAN_FILES = *.o \
@@ -135,7 +136,11 @@ qtime-test: qtime-test.o
qdatetime-test: qdatetime-test.o
$(CXX) -o $@ $< $(LDFLAGS) $(LIBS)
+
+qsortedlist-test: qsortedlist-test.o
+ $(CXX) -o $@ $< $(LDFLAGS) $(LIBS)
+
depend:
#----------------------------------------------------------------------
diff --git a/WebCore/kwq/tests/qt/qlist-test.chk b/WebCore/kwq/tests/qt/qsortedlist-test.chk
similarity index 77%
copy from WebCore/kwq/tests/qt/qlist-test.chk
copy to WebCore/kwq/tests/qt/qsortedlist-test.chk
index c97616e..8e295ed 100644
--- a/WebCore/kwq/tests/qt/qlist-test.chk
+++ b/WebCore/kwq/tests/qt/qsortedlist-test.chk
@@ -11,20 +11,20 @@ p1 take: 5 QList: [size: 4; items: 1, 2, 3, 4]
p1 containsRef 3: 1
p1 containsRef 0: 0
p2 unsorted: QList: [size: 7; items: 6, 5, 4, 3, 2, 1, 0]
-p2 sorted: QList: [size: 7; items: 6, 0, 1, 2, 3, 5, 4]
+p2 sorted: QList: [size: 7; items: 0, 1, 2, 3, 4, 5, 6]
p1 at 2: 3
p1 insert 7 in 1: QList: [size: 8; items: 1, 7, 8, 9, 10, 2, 3, 4]
p1 remove: QList: [size: 7; items: 1, 7, 8, 9, 2, 3, 4]
p1 remove 7: QList: [size: 6; items: 1, 8, 9, 2, 3, 4]
p1 removeRef 8: QList: [size: 5; items: 1, 9, 2, 3, 4]
-p2 getLast: 4
-p2 current: 4
-p2 first: 6
-p2 last: 4
+p2 getLast: 6
+p2 current: 6
+p2 first: 0
+p2 last: 6
p2 prev: 5
-p2 next: 4
-p2 prepend 9: QList: [size: 8; items: 9, 6, 0, 1, 2, 3, 5, 4]
+p2 next: 6
+p2 prepend 9: QList: [size: 8; items: 9, 0, 1, 2, 3, 4, 5, 6]
p1: QList: [size: 5; items: 1, 9, 2, 3, 4]
p1 clear (autoDelete off): QList: [size: 0; items: ]
p1 clear (autoDelete on): QList: [size: 0; items: ]
-p3 = p2: QList: [size: 8; items: 9, 6, 0, 1, 2, 3, 5, 4]
+p3 = p2: QList: [size: 8; items: 9, 0, 1, 2, 3, 4, 5, 6]
diff --git a/WebCore/src/kwq/tests/qt/qlist-test.cpp b/WebCore/kwq/tests/qt/qsortedlist-test.cpp
similarity index 95%
copy from WebCore/src/kwq/tests/qt/qlist-test.cpp
copy to WebCore/kwq/tests/qt/qsortedlist-test.cpp
index abe009b..67a77ed 100644
--- a/WebCore/src/kwq/tests/qt/qlist-test.cpp
+++ b/WebCore/kwq/tests/qt/qsortedlist-test.cpp
@@ -3,14 +3,14 @@
#include <stdlib.h>
#include <string.h>
-#include <qlist.h>
+#include <qsortedlist.h>
int main() {
- QList<int> p0;
- QList<int> p1;
- QList<int> p2;
- QList<int> p3;
+ QSortedList<int> p0;
+ QSortedList<int> p1;
+ QSortedList<int> p2;
+ QSortedList<int> p3;
int i = 0;
int j = 1;
diff --git a/WebCore/kwq/tests/test.list b/WebCore/kwq/tests/test.list
index c886677..5fd6fcb 100644
--- a/WebCore/kwq/tests/test.list
+++ b/WebCore/kwq/tests/test.list
@@ -18,3 +18,4 @@ qt/qtime-test
qt/qdatetime-test
qt/qstring-test
qt/qvector-test
+qt/qsortedlist-test
diff --git a/WebCore/src/kwq/tests/qt/Makefile.in b/WebCore/src/kwq/tests/qt/Makefile.in
index a872762..6475a28 100644
--- a/WebCore/src/kwq/tests/qt/Makefile.in
+++ b/WebCore/src/kwq/tests/qt/Makefile.in
@@ -40,6 +40,7 @@ PROGRAMS = \
qdate-test \
qtime-test \
qdatetime-test \
+ qsortedlist-test \
$(NULL)
CLEAN_FILES = *.o \
@@ -135,7 +136,11 @@ qtime-test: qtime-test.o
qdatetime-test: qdatetime-test.o
$(CXX) -o $@ $< $(LDFLAGS) $(LIBS)
+
+qsortedlist-test: qsortedlist-test.o
+ $(CXX) -o $@ $< $(LDFLAGS) $(LIBS)
+
depend:
#----------------------------------------------------------------------
diff --git a/WebCore/kwq/tests/qt/qlist-test.chk b/WebCore/src/kwq/tests/qt/qsortedlist-test.chk
similarity index 77%
copy from WebCore/kwq/tests/qt/qlist-test.chk
copy to WebCore/src/kwq/tests/qt/qsortedlist-test.chk
index c97616e..8e295ed 100644
--- a/WebCore/kwq/tests/qt/qlist-test.chk
+++ b/WebCore/src/kwq/tests/qt/qsortedlist-test.chk
@@ -11,20 +11,20 @@ p1 take: 5 QList: [size: 4; items: 1, 2, 3, 4]
p1 containsRef 3: 1
p1 containsRef 0: 0
p2 unsorted: QList: [size: 7; items: 6, 5, 4, 3, 2, 1, 0]
-p2 sorted: QList: [size: 7; items: 6, 0, 1, 2, 3, 5, 4]
+p2 sorted: QList: [size: 7; items: 0, 1, 2, 3, 4, 5, 6]
p1 at 2: 3
p1 insert 7 in 1: QList: [size: 8; items: 1, 7, 8, 9, 10, 2, 3, 4]
p1 remove: QList: [size: 7; items: 1, 7, 8, 9, 2, 3, 4]
p1 remove 7: QList: [size: 6; items: 1, 8, 9, 2, 3, 4]
p1 removeRef 8: QList: [size: 5; items: 1, 9, 2, 3, 4]
-p2 getLast: 4
-p2 current: 4
-p2 first: 6
-p2 last: 4
+p2 getLast: 6
+p2 current: 6
+p2 first: 0
+p2 last: 6
p2 prev: 5
-p2 next: 4
-p2 prepend 9: QList: [size: 8; items: 9, 6, 0, 1, 2, 3, 5, 4]
+p2 next: 6
+p2 prepend 9: QList: [size: 8; items: 9, 0, 1, 2, 3, 4, 5, 6]
p1: QList: [size: 5; items: 1, 9, 2, 3, 4]
p1 clear (autoDelete off): QList: [size: 0; items: ]
p1 clear (autoDelete on): QList: [size: 0; items: ]
-p3 = p2: QList: [size: 8; items: 9, 6, 0, 1, 2, 3, 5, 4]
+p3 = p2: QList: [size: 8; items: 9, 0, 1, 2, 3, 4, 5, 6]
diff --git a/WebCore/src/kwq/tests/qt/qlist-test.cpp b/WebCore/src/kwq/tests/qt/qsortedlist-test.cpp
similarity index 95%
copy from WebCore/src/kwq/tests/qt/qlist-test.cpp
copy to WebCore/src/kwq/tests/qt/qsortedlist-test.cpp
index abe009b..67a77ed 100644
--- a/WebCore/src/kwq/tests/qt/qlist-test.cpp
+++ b/WebCore/src/kwq/tests/qt/qsortedlist-test.cpp
@@ -3,14 +3,14 @@
#include <stdlib.h>
#include <string.h>
-#include <qlist.h>
+#include <qsortedlist.h>
int main() {
- QList<int> p0;
- QList<int> p1;
- QList<int> p2;
- QList<int> p3;
+ QSortedList<int> p0;
+ QSortedList<int> p1;
+ QSortedList<int> p2;
+ QSortedList<int> p3;
int i = 0;
int j = 1;
diff --git a/WebCore/src/kwq/tests/test.list b/WebCore/src/kwq/tests/test.list
index c886677..5fd6fcb 100644
--- a/WebCore/src/kwq/tests/test.list
+++ b/WebCore/src/kwq/tests/test.list
@@ -18,3 +18,4 @@ qt/qtime-test
qt/qdatetime-test
qt/qstring-test
qt/qvector-test
+qt/qsortedlist-test
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list