Reviewers: Jakob,
Description:
Merged r16303 into trunk branch.
Fix mjsunit/debug-script after r16298
[email protected]
BUG=
Please review this at https://codereview.chromium.org/22843006/
SVN Base: https://v8.googlecode.com/svn/trunk
Affected files:
M src/version.cc
M test/mjsunit/debug-script.js
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
3f38908ab205c41d3b0c1adf30ca007a9f6f13f5..1d28f6c02275f42806c13219e771b4cbfbb8d022
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 21
#define BUILD_NUMBER 3
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
Index: test/mjsunit/debug-script.js
diff --git a/test/mjsunit/debug-script.js b/test/mjsunit/debug-script.js
index
c61d7c5c2794af404fcc959dac157796c0ebfaff..1cbdb376ccd28bf19aa67e4d09b1dd5aab0ed843
100644
--- a/test/mjsunit/debug-script.js
+++ b/test/mjsunit/debug-script.js
@@ -59,9 +59,9 @@ for (i = 0; i < scripts.length; i++) {
}
// This has to be updated if the number of native scripts change.
-assertEquals(17, named_native_count);
-// Only the 'gc' and (depending on flags) the 'i18n' extensions are loaded.
-assertTrue(extension_count == 1 || extension_count == 2);
+assertTrue(named_native_count == 16 || named_native_count == 17);
+// Only the 'gc' extension is loaded.
+assertEquals(1, extension_count);
// This script and mjsunit.js has been loaded. If using d8, d8 loads
// a normal script during startup too.
assertTrue(normal_count == 2 || normal_count == 3);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
