770938 - fix toolkit/components/ctypes/test/Makefile.in mochitest-chrome test path

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Nathan Froyd [:froydnj]]

The aforementioned file has this:

chrometestdir = \
  $(DEPTH)/_tests/testing/mochitest/chrome/toolkit/components/$(relativesrcdir)

But of course we have:

relativesrcdir = toolkit/components/ctypes/tests

So we wind up with toolkit/components/toolkit/components...  This inhibits a transition to MOCHITEST_*_FILES variables (bug 370750) for this Makefile.

We'd be changing test paths if we sanitized chrometestdir, but maybe that's not such a big deal...

Comment 1

[(not currently active) Ted Mielczarek]

Attachment: fix ctypes test junk

This patch cleans this up significantly, leaving only the "copy the shared library to the test directories" bits. In case you were wondering, the chrome/libraries copy is vestigal, it just didn't get removed when bug 711838 removed the rest of the jetpack process support.

I had to move the mochitest-chrome tests to a subdir to get everything to work properly, but I think it's fine. These tests all pass locally. The changes to the tests were necessary because I wanted to stop preprocessing it, but the xpcshell test also runs in a ChromeWorker, and it doesn't have access to XPCOM there, so I had to pass nsIXULRuntime.OS in from the main thread.

Comment 2

[(not currently active) Ted Mielczarek]

Attachment: fix ctypes test junk

Oops, forgot to hg add the new manifest.

Comment 3

[Gregory Szorc [:gps]]

Comment on attachment 8383771 [details] [diff] [review]
fix ctypes test junk

Review of attachment 8383771 [details] [diff] [review]:
-----------------------------------------------------------------

Land it!

::: toolkit/components/ctypes/tests/Makefile.in
@@ -3,5 @@
>  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
>  
>  EXTRA_DSO_LDOPTS += $(MOZALLOC_LIB)
>  
> -xpctestdir = $(testxpcobjdir)/$(relativesrcdir)/unit

Wait, $(testxpcobjdir) still exists?!

Comment 4

[(not currently active) Ted Mielczarek]

https://hg.mozilla.org/integration/mozilla-inbound/rev/e9aafdc00b47

Comment 5

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/e9aafdc00b47