Merge lp:~nbrinza/zorba/bugs2 into lp:zorba

Proposed by Nicolae Brinza
Status: Superseded
Proposed branch: lp:~nbrinza/zorba/bugs2
Merge into: lp:zorba
Diff against target: 42 lines (+16/-16)
1 file modified
test/fots/CMakeLists.txt (+16/-16)
To merge this branch: bzr merge lp:~nbrinza/zorba/bugs2
Reviewer Review Type Date Requested Status
Sorin Marian Nasoi Approve
Nicolae Brinza Approve
Review via email: mp+160440@code.launchpad.net

This proposal has been superseded by a proposal from 2013-04-23.

Commit message

Added W3C bug reference in disputed bugs

Description of the change

Added W3C bug reference in disputed bugs

To post a comment you must log in.
Revision history for this message
Nicolae Brinza (nbrinza) :
review: Approve
Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) wrote :

The disputed test cases have to be logged as:
EXPECTED_FOTS_FAILURE (DISPUTED TEST_SET_NAME TEST_CASE_NAME W3C_BUG_NO)

Please see:
- http://bazaar.launchpad.net/~zorba-coders/zorba/trunk/view/head:/test/fots/CMakeLists.txt#L118
- https://bugs.launchpad.net/zorba/+bug/1147547/comments/5

Also this merge proposal is a fix for lp:1147547: can you please rename the branch to something unique? As you can see LP assumes that you have a branch called bugs2 that you regularly merge into the trunk. That is why the history from LP links 'bugs2' branch to every bug that was fixed from a branch with name 'bugs2'.

review: Needs Fixing
Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) wrote :

I would have corrected the changes in test/CMakeLists.txt myself if the branch owner would have been zorba-coders.

Like it is now, only you can commit to this branch.

lp:~nbrinza/zorba/bugs2 updated
11028. By Nicolae Brinza

Added DISPUTED to the tests that pend on W3C bugs

Revision history for this message
Nicolae Brinza (nbrinza) wrote :

I've added DISPUTED to the tests.

Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) :
review: Approve
lp:~nbrinza/zorba/bugs2 updated
11029. By Nicolae Brinza

Merged with Zorba trunk

11030. By Nicolae Brinza

Merged with the fix_bug_1167641 branch

Unmerged revisions

11030. By Nicolae Brinza

Merged with the fix_bug_1167641 branch

11029. By Nicolae Brinza

Merged with Zorba trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/fots/CMakeLists.txt'
2--- test/fots/CMakeLists.txt 2013-04-23 13:55:03 +0000
3+++ test/fots/CMakeLists.txt 2013-04-23 17:30:36 +0000
4@@ -325,22 +325,22 @@
5 EXPECTED_FOTS_FAILURE (prod-FunctionCall function-call-reserved-function-names-014 0)
6 EXPECTED_FOTS_FAILURE (prod-FunctionCall function-call-reserved-function-names-015 0)
7 EXPECTED_FOTS_FAILURE (prod-FunctionCall function-call-reserved-function-names-016 0)
8-EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-001 0)
9-EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-003 0)
10-EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-005 0)
11-EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-007 0)
12-EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-009 0)
13-EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-012 0)
14-EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-013 0)
15-EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-015 0)
16-EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-017 0)
17-EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-019 0)
18-EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-021 0)
19-EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-023 0)
20-EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-025 0)
21-EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-027 0)
22-EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-029 0)
23-EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-031 0)
24+EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-001 21568)
25+EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-003 21568)
26+EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-005 21568)
27+EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-007 21568)
28+EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-009 21568)
29+EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-012 21568)
30+EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-013 21568)
31+EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-015 21568)
32+EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-017 21568)
33+EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-019 21568)
34+EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-021 21568)
35+EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-023 21568)
36+EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-025 21568)
37+EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-027 21568)
38+EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-029 21568)
39+EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-031 21568)
40 EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof113 0)
41 EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof131 0)
42 EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof139 1160559)

Subscribers

People subscribed via source and target branches