Zorba

Merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba

  1. markos-scratch
  2. Merge into trunk
Proposed by Markos Zaharioudakis
Status: Merged
Approved by: Markos Zaharioudakis
Approved revision: 11141
Merged at revision: 11501
Proposed branch: lp:~zorba-coders/zorba/markos-scratch
Merge into: lp:zorba
Diff against target: 65 lines (+4/-17)
2 files modified
src/compiler/translator/translator.cpp (+4/-4)
test/fots/CMakeLists.txt (+0/-13)
To merge this branch: bzr merge lp:~zorba-coders/zorba/markos-scratch
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Review via email: mp+168644@code.launchpad.net

Commit message

fix hof regressions caused by Sorin/Nicolai checkin in 11491

Description of the change

fix hof regressions caused by Sorin/Nicolai checkin in 11491

To post a comment you must log in.
Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-06-11T11-24-56.578Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message):
  Validation queue job markos-scratch-2013-06-11T11-24-56.578Z is finished.
  The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

lp:~zorba-coders/zorba/markos-scratch updated
11141. By Markos Zaharioudakis

fix hof regressions caused by Sorin/Nicolai checkin in 11491

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-06-11T14-27-55.813Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job markos-scratch-2013-06-11T14-27-55.813Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/compiler/translator/translator.cpp'
2--- src/compiler/translator/translator.cpp 2013-06-11 09:43:21 +0000
3+++ src/compiler/translator/translator.cpp 2013-06-11 14:22:32 +0000
4@@ -12156,9 +12156,9 @@
5 }
6 case FunctionConsts::FN_FOLD_RIGHT_3:
7 {
8- arguments[2] = CREATE(fo)(theRootSctx, theUDF, loc,
9+ arguments[0] = CREATE(fo)(theRootSctx, theUDF, loc,
10 BUILTIN_FUNC(FN_REVERSE_1),
11- arguments[2]);
12+ arguments[0]);
13 break;
14 }
15 case FunctionConsts::FN_FOR_EACH_2:
16@@ -12640,9 +12640,9 @@
17 {
18 flwor_expr* flworBody = CREATE(flwor)(theRootSctx, theUDF, loc);
19
20- let_clause* lc = wrap_in_letclause(foArgs[0]);
21+ let_clause* lc = wrap_in_letclause(foArgs[1]);
22 flworBody->add_clause(lc);
23- foArgs[0] = CREATE(wrapper)(theRootSctx, theUDF, loc, lc->get_var());
24+ foArgs[1] = CREATE(wrapper)(theRootSctx, theUDF, loc, lc->get_var());
25
26 flworBody->set_return_expr(generate_fn_body(f, foArgs, loc));
27 body = flworBody;
28
29=== modified file 'test/fots/CMakeLists.txt'
30--- test/fots/CMakeLists.txt 2013-06-11 12:27:33 +0000
31+++ test/fots/CMakeLists.txt 2013-06-11 14:22:32 +0000
32@@ -143,13 +143,6 @@
33 EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog010 1187807)
34 EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog011 1187807)
35 EXPECTED_FOTS_FAILURE (fn-fold-left fold-left-009 1187685)
36-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-005 1187685)
37-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-006 1187685)
38-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-007 1187685)
39-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-014 1187685)
40-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-015 1187685)
41-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-016 1187685)
42-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-017 1187685)
43 EXPECTED_FOTS_FAILURE (fn-for-each-pair fn-for-each-pair-026 1187685)
44 EXPECTED_FOTS_FAILURE (fn-format-number numberformat60a 1167609)
45 EXPECTED_FOTS_FAILURE (fn-format-number numberformat60m 1167609)
46@@ -160,9 +153,6 @@
47 EXPECTED_FOTS_FAILURE (fn-format-number numberformat83 1167641)
48 EXPECTED_FOTS_FAILURE (fn-format-number numberformat87 1167641)
49 EXPECTED_FOTS_FAILURE (fn-format-number numberformat88 1167641)
50-EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-424 1187685)
51-EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-426 1187685)
52-EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-430 1187685)
53 EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-062 1187685)
54 EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-530 1188329)
55 EXPECTED_FOTS_FAILURE (fn-matches cbcl-matches-038 1131304)
56@@ -295,9 +285,6 @@
57 EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-17 1160015)
58 EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-18 1160015)
59 EXPECTED_FOTS_FAILURE (prod-NamedFunctionRef function-literal-062 1182910)
60-EXPECTED_FOTS_FAILURE (prod-NamedFunctionRef function-literal-424 1182910)
61-EXPECTED_FOTS_FAILURE (prod-NamedFunctionRef function-literal-426 1182910)
62-EXPECTED_FOTS_FAILURE (prod-NamedFunctionRef function-literal-430 1182910)
63 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-003 1188159)
64 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy40 1172258)
65 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy41 1172258)

Subscribers

People subscribed via source and target branches