Attachment #93443 for bug #60761

View Details Raw Unified Return to Bug 60761



2011-05-13  Zoltan Herczeg  <zherczeg@webkit.org>

        Reviewed by NOBODY (OOPS!).

        Missing 2nd #EOF if WebProcess is killed.
        https://bugs.webkit.org/show_bug.cgi?id=60761

        If the WebProcess is killed, only one #EOF is yielded
        by WebKitTestRunner. However, run-webkit-test wait for
        a second #EOF, which signals the finishing of pixel dump.
        Since this never happens, run-webkit-test waits forever.

        * WebKitTestRunner/TestInvocation.cpp:
        (WTR::TestInvocation::dump):
        (WTR::TestInvocation::didReceiveMessageFromInjectedBundle):
        * WebKitTestRunner/TestInvocation.h:

2011-05-12  Ryuan Choi  <ryuan.choi@samsung.com>

        Reviewed by Antonio Gomes.



    WKInspectorClose(WKPageGetInspector(TestController::shared().mainWebView()->page()));
}

void TestInvocation::dump(const char* stringToDump, bool singleEOF)
{
    printf("Content-Type: text/plain\n");
    printf("%s", stringToDump);

    fputs("#EOF\n", stdout);
    fputs("#EOF\n", stderr);
    if (!singleEOF)
        fputs("#EOF\n", stdout);
    fflush(stdout);
    fflush(stderr);
}

        ASSERT(!pixelResult || m_dumpPixels);

        // Dump text.
        dump(toSTD(textOutput).c_str(), true);

        // Dump pixels (if necessary).
        if (m_dumpPixels && pixelResult)



    WKRetainPtr<WKTypeRef> didReceiveSynchronousMessageFromInjectedBundle(WKStringRef messageName, WKTypeRef messageBody);

private:
    void dump(const char*, bool singleEOF = false);
    void dumpPixelsAndCompareWithExpected(WKImageRef);
    
    WKRetainPtr<WKURLRef> m_url;
- 

Return to Bug 60761

Lines 161-173 void TestInvocation::invoke() a/Tools/WebKitTestRunner/TestInvocation.cpp_sec1
- a/Tools/WebKitTestRunner/TestInvocation.cpp -2 / +4 lines
161	WKInspectorClose(WKPageGetInspector(TestController::shared().mainWebView()->page()));	161	WKInspectorClose(WKPageGetInspector(TestController::shared().mainWebView()->page()));
162	}	162	}
163		163
164	void TestInvocation::dump(const char* stringToDump)	164	void TestInvocation::dump(const char* stringToDump, bool singleEOF)
165	{	165	{
166	printf("Content-Type: text/plain\n");	166	printf("Content-Type: text/plain\n");
167	printf("%s", stringToDump);	167	printf("%s", stringToDump);
168		168
169	fputs("#EOF\n", stdout);	169	fputs("#EOF\n", stdout);
170	fputs("#EOF\n", stderr);	170	fputs("#EOF\n", stderr);
		171	if (!singleEOF)
		172	fputs("#EOF\n", stdout);
171	fflush(stdout);	173	fflush(stdout);
172	fflush(stderr);	174	fflush(stderr);
173	}	175	}
Lines 207-213 void TestInvocation::didReceiveMessageFromInjectedBundle(WKStringRef messageName a/Tools/WebKitTestRunner/TestInvocation.cpp_sec2
207	ASSERT(!pixelResult \|\| m_dumpPixels);	209	ASSERT(!pixelResult \|\| m_dumpPixels);
208		210
209	// Dump text.	211	// Dump text.
210	dump(toSTD(textOutput).c_str());	212	dump(toSTD(textOutput).c_str(), true);
211		213
212	// Dump pixels (if necessary).	214	// Dump pixels (if necessary).
213	if (m_dumpPixels && pixelResult)	215	if (m_dumpPixels && pixelResult)

Lines 45-51 public: a/Tools/WebKitTestRunner/TestInvocation.h_sec1
- a/Tools/WebKitTestRunner/TestInvocation.h -2 / +1 lines
45	WKRetainPtr<WKTypeRef> didReceiveSynchronousMessageFromInjectedBundle(WKStringRef messageName, WKTypeRef messageBody);	45	WKRetainPtr<WKTypeRef> didReceiveSynchronousMessageFromInjectedBundle(WKStringRef messageName, WKTypeRef messageBody);
46		46
47	private:	47	private:
48	void dump(const char*);	48	void dump(const char*, bool singleEOF = false);
49	void dumpPixelsAndCompareWithExpected(WKImageRef);	49	void dumpPixelsAndCompareWithExpected(WKImageRef);
50		50
51	WKRetainPtr<WKURLRef> m_url;	51	WKRetainPtr<WKURLRef> m_url;
52	-

Lines 1-3 a/Tools/ChangeLog_sec1
- a/Tools/ChangeLog +17 lines
		1	2011-05-13 Zoltan Herczeg <zherczeg@webkit.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	Missing 2nd #EOF if WebProcess is killed.
		6	https://bugs.webkit.org/show_bug.cgi?id=60761
		7
		8	If the WebProcess is killed, only one #EOF is yielded
		9	by WebKitTestRunner. However, run-webkit-test wait for
		10	a second #EOF, which signals the finishing of pixel dump.
		11	Since this never happens, run-webkit-test waits forever.
		12
		13	* WebKitTestRunner/TestInvocation.cpp:
		14	(WTR::TestInvocation::dump):
		15	(WTR::TestInvocation::didReceiveMessageFromInjectedBundle):
		16	* WebKitTestRunner/TestInvocation.h:
		17
1	2011-05-12 Ryuan Choi <ryuan.choi@samsung.com>	18	2011-05-12 Ryuan Choi <ryuan.choi@samsung.com>
2		19
3	Reviewed by Antonio Gomes.	20	Reviewed by Antonio Gomes.