Mariapacana has uploaded a new change for review.
https://gerrit.wikimedia.org/r/94380
Change subject: * Sets --htmlwt when --selser flag is set. * Automatically
enables --trace wts whenever --trace selser is set. * Enables tracing flags in
roundtrip.js.
......................................................................
* Sets --htmlwt when --selser flag is set.
* Automatically enables --trace wts whenever --trace selser is set.
* Enables tracing flags in roundtrip.js.
Change-Id: I80a8a15bd6d3629613ee80744e8a28e127c44b38
---
M js/lib/mediawiki.Util.js
A js/tests/npm-debug.log
M js/tests/parse.js
M js/tests/roundtrip-test.js
A npm-debug.log
5 files changed, 59 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/80/94380/1
diff --git a/js/lib/mediawiki.Util.js b/js/lib/mediawiki.Util.js
index 93f3bb3..067dbb0 100644
--- a/js/lib/mediawiki.Util.js
+++ b/js/lib/mediawiki.Util.js
@@ -33,14 +33,21 @@
* @param {Object} opts The options object to use for setting the debug
flags.
* @returns {Object} The modified object.
*/
- setDebuggingFlags: function(obj, opts) {
- obj.debug = Util.booleanOption( opts.debug );
- obj.trace = (opts.trace === true);
- obj.traceFlags = opts.trace && opts.trace !== true ?
opts.trace.split(",") : null;
- obj.dumpFlags = opts.dump ? opts.dump.split(",") : null;
+ setDebuggingFlags: function(obj, opts) {
+ obj.debug = Util.booleanOption( opts.debug );
+ obj.trace = (opts.trace === true);
- return obj;
- },
+ if (opts.trace && opts.trace !== true) {
+ obj.traceFlags = opts.trace.split(",");
+ if (obj.traceFlags.indexOf("selser") != -1) {
+ obj.traceFlags.push("wts");
+ }
+ }
+
+ obj.dumpFlags = opts.dump ? opts.dump.split(",") : null;
+
+ return obj;
+ },
/**
* @method
diff --git a/js/tests/npm-debug.log b/js/tests/npm-debug.log
new file mode 100644
index 0000000..063a288
--- /dev/null
+++ b/js/tests/npm-debug.log
@@ -0,0 +1,19 @@
+0 info it worked if it ends with ok
+1 verbose cli [ '/usr/bin/node', '/usr/bin/npm', 'test' ]
+2 info using npm@1.3.11
+3 info using node@v0.10.21
+4 verbose node symlink /usr/bin/node
+5 error Error: ENOENT, open '/home/maria/Documents/2.
Programming/projects/parsoid/js/tests/package.json'
+6 error If you need help, you may report this log at:
+6 error <http://github.com/isaacs/npm/issues>
+6 error or email it to:
+6 error <n...@googlegroups.com>
+7 error System Linux 3.2.0-55-generic
+8 error command "/usr/bin/node" "/usr/bin/npm" "test"
+9 error cwd /home/maria/Documents/2. Programming/projects/parsoid/js/tests
+10 error node -v v0.10.21
+11 error npm -v 1.3.11
+12 error path /home/maria/Documents/2.
Programming/projects/parsoid/js/tests/package.json
+13 error code ENOENT
+14 error errno 34
+15 verbose exit [ 34, true ]
diff --git a/js/tests/parse.js b/js/tests/parse.js
index e59b4f8..2c848bb 100755
--- a/js/tests/parse.js
+++ b/js/tests/parse.js
@@ -208,6 +208,11 @@
return;
}
+ //Setting html2wt when selser
+ if (argv.selser) {
+ argv.html2wt = true;
+ }
+
// Default conversion mode
if (!argv.html2wt && !argv.wt2wt && !argv.html2html) {
argv.wt2html = true;
diff --git a/js/tests/roundtrip-test.js b/js/tests/roundtrip-test.js
index e37f1ac..24267f1 100755
--- a/js/tests/roundtrip-test.js
+++ b/js/tests/roundtrip-test.js
@@ -440,6 +440,7 @@
return;
}
env.profile = { time: { total: 0, total_timer: new Date() },
size: {} };
+ Util.setDebuggingFlags( env.conf.parsoid, argv );
var target = env.resolveTitle( env.normalizeTitle(
env.page.name ), '' );
var tpr = new TemplateRequest( env, target, null );
diff --git a/npm-debug.log b/npm-debug.log
new file mode 100644
index 0000000..2f56ac9
--- /dev/null
+++ b/npm-debug.log
@@ -0,0 +1,20 @@
+0 info it worked if it ends with ok
+1 verbose cli [ '/usr/bin/node', '/usr/bin/npm', 'install' ]
+2 info using npm@1.3.11
+3 info using node@v0.10.21
+4 verbose node symlink /usr/bin/node
+5 error install Couldn't read dependencies
+6 error Error: ENOENT, open '/home/maria/Documents/2.
Programming/projects/parsoid/package.json'
+7 error If you need help, you may report this log at:
+7 error <http://github.com/isaacs/npm/issues>
+7 error or email it to:
+7 error <n...@googlegroups.com>
+8 error System Linux 3.2.0-55-generic
+9 error command "/usr/bin/node" "/usr/bin/npm" "install"
+10 error cwd /home/maria/Documents/2. Programming/projects/parsoid
+11 error node -v v0.10.21
+12 error npm -v 1.3.11
+13 error path /home/maria/Documents/2.
Programming/projects/parsoid/package.json
+14 error code ENOENT
+15 error errno 34
+16 verbose exit [ 34, true ]
--
To view, visit https://gerrit.wikimedia.org/r/94380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80a8a15bd6d3629613ee80744e8a28e127c44b38
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Mariapacana <maria.pac...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
