Fix tests to run on different v8 versions

pinepain · pinepain · commit f4bb4ef38bb0 · 2016-07-17T16:44:28.000+03:00
diff --git a/tests/V8Exception_CreateMessage.phpt b/tests/V8Exception_CreateMessage.phpt
@@ -71,7 +71,7 @@ $helper->line();
 
 $v8_helper->run_checks($res);
 ?>
---EXPECT--
+--EXPECTF--
 Can create message when out of context: ok
 
 exception: '[object Object]'
@@ -101,7 +101,7 @@ v8\Message->GetScriptOrigin():
         bool(false)
       }
       ["script_id":"v8\ScriptOrigin":private]=>
-      int(38)
+      int(%d)
       ["source_map_url":"v8\ScriptOrigin":private]=>
       string(0) ""
     }
@@ -137,7 +137,7 @@ v8\Message->GetScriptOrigin():
         bool(false)
       }
       ["script_id":"v8\ScriptOrigin":private]=>
-      int(38)
+      int(%d)
       ["source_map_url":"v8\ScriptOrigin":private]=>
       string(0) ""
     }
diff --git a/tests/V8StackTrace_CurrentStackTrace.phpt b/tests/V8StackTrace_CurrentStackTrace.phpt
@@ -133,25 +133,25 @@ $isolate = null;
 
 echo 'END', PHP_EOL;
 ?>
---EXPECT--
+--EXPECTF--
 totally 0 frames:
 [
 ]
 
 totally 1 frames:
 [
-    {"column":17,"lineNumber":14,"scriptName":"test.js","scriptNameOrSourceURL":"test.js","functionName":"get_trace","isEval":false,"isConstructor":false}
+    {"column":17,"lineNumber":14,"scriptName":"test.js","scriptNameOrSourceURL":"test.js","isEval":false,"functionName":"get_trace","isConstructor":false}
 ]
 
 totally 2 frames:
 [
-    {"column":17,"lineNumber":14,"scriptId":34}
-    {"column":1,"lineNumber":46,"scriptId":34}
+    {"column":17,"lineNumber":14,"scriptId":%d}
+    {"column":1,"lineNumber":46,"scriptId":%d}
 ]
 
 totally 1 frames:
 [
-    {"column":17,"lineNumber":14,"scriptId":34,"scriptName":"test.js","scriptNameOrSourceURL":"test.js","functionName":"get_trace","isEval":false,"isConstructor":false}
+    {"column":17,"lineNumber":14,"scriptId":%d,"scriptName":"test.js","scriptNameOrSourceURL":"test.js","isEval":false,"functionName":"get_trace","isConstructor":false}
 ]
 
 totally 10 frames:
@@ -170,8 +170,8 @@ totally 10 frames:
 
 totally 2 frames:
 [
-    {"column":17,"lineNumber":14,"scriptId":34,"scriptName":"test.js","scriptNameOrSourceURL":"test.js","functionName":"get_trace","isEval":false,"isConstructor":false}
-    {"column":1,"lineNumber":53,"scriptId":34,"scriptName":"test.js","scriptNameOrSourceURL":"test.js","functionName":"","isEval":false,"isConstructor":false}
+    {"column":17,"lineNumber":14,"scriptId":%d,"scriptName":"test.js","scriptNameOrSourceURL":"test.js","isEval":false,"functionName":"get_trace","isConstructor":false}
+    {"column":1,"lineNumber":53,"scriptId":%d,"scriptName":"test.js","scriptNameOrSourceURL":"test.js","isEval":false,"functionName":"","isConstructor":false}
 ]
 
 JS-land stack trace:

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ $helper->line();`
`71`	`71`
`72`	`72`	`$v8_helper->run_checks($res);`
`73`	`73`	`?>`
`74`		`---EXPECT--`
	`74`	`+--EXPECTF--`
`75`	`75`	`Can create message when out of context: ok`
`76`	`76`
`77`	`77`	`exception: '[object Object]'`
`@@ -101,7 +101,7 @@ v8\Message->GetScriptOrigin():`
`101`	`101`	`bool(false)`
`102`	`102`	`}`
`103`	`103`	`["script_id":"v8\ScriptOrigin":private]=>`
`104`		`- int(38)`
	`104`	`+ int(%d)`
`105`	`105`	`["source_map_url":"v8\ScriptOrigin":private]=>`
`106`	`106`	`string(0) ""`
`107`	`107`	`}`
`@@ -137,7 +137,7 @@ v8\Message->GetScriptOrigin():`
`137`	`137`	`bool(false)`
`138`	`138`	`}`
`139`	`139`	`["script_id":"v8\ScriptOrigin":private]=>`
`140`		`- int(38)`
	`140`	`+ int(%d)`
`141`	`141`	`["source_map_url":"v8\ScriptOrigin":private]=>`
`142`	`142`	`string(0) ""`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,25 +133,25 @@ $isolate = null;`
`133`	`133`
`134`	`134`	`echo 'END', PHP_EOL;`
`135`	`135`	`?>`
`136`		`---EXPECT--`
	`136`	`+--EXPECTF--`
`137`	`137`	`totally 0 frames:`
`138`	`138`	`[`
`139`	`139`	`]`
`140`	`140`
`141`	`141`	`totally 1 frames:`
`142`	`142`	`[`
`143`		`- {"column":17,"lineNumber":14,"scriptName":"test.js","scriptNameOrSourceURL":"test.js","functionName":"get_trace","isEval":false,"isConstructor":false}`
	`143`	`+ {"column":17,"lineNumber":14,"scriptName":"test.js","scriptNameOrSourceURL":"test.js","isEval":false,"functionName":"get_trace","isConstructor":false}`
`144`	`144`	`]`
`145`	`145`
`146`	`146`	`totally 2 frames:`
`147`	`147`	`[`
`148`		`- {"column":17,"lineNumber":14,"scriptId":34}`
`149`		`- {"column":1,"lineNumber":46,"scriptId":34}`
	`148`	`+ {"column":17,"lineNumber":14,"scriptId":%d}`
	`149`	`+ {"column":1,"lineNumber":46,"scriptId":%d}`
`150`	`150`	`]`
`151`	`151`
`152`	`152`	`totally 1 frames:`
`153`	`153`	`[`
`154`		`- {"column":17,"lineNumber":14,"scriptId":34,"scriptName":"test.js","scriptNameOrSourceURL":"test.js","functionName":"get_trace","isEval":false,"isConstructor":false}`
	`154`	`+ {"column":17,"lineNumber":14,"scriptId":%d,"scriptName":"test.js","scriptNameOrSourceURL":"test.js","isEval":false,"functionName":"get_trace","isConstructor":false}`
`155`	`155`	`]`
`156`	`156`
`157`	`157`	`totally 10 frames:`
`@@ -170,8 +170,8 @@ totally 10 frames:`
`170`	`170`
`171`	`171`	`totally 2 frames:`
`172`	`172`	`[`
`173`		`- {"column":17,"lineNumber":14,"scriptId":34,"scriptName":"test.js","scriptNameOrSourceURL":"test.js","functionName":"get_trace","isEval":false,"isConstructor":false}`
`174`		`- {"column":1,"lineNumber":53,"scriptId":34,"scriptName":"test.js","scriptNameOrSourceURL":"test.js","functionName":"","isEval":false,"isConstructor":false}`
	`173`	`+ {"column":17,"lineNumber":14,"scriptId":%d,"scriptName":"test.js","scriptNameOrSourceURL":"test.js","isEval":false,"functionName":"get_trace","isConstructor":false}`
	`174`	`+ {"column":1,"lineNumber":53,"scriptId":%d,"scriptName":"test.js","scriptNameOrSourceURL":"test.js","isEval":false,"functionName":"","isConstructor":false}`
`175`	`175`	`]`
`176`	`176`
`177`	`177`	`JS-land stack trace:`