зеркало из https://github.com/mozilla/pjs.git
Bug 426639 - Fix the test harness to work on OS/2; m-c *.mk files; r=mozilla@Weilbacher.org
This commit is contained in:
Родитель
944d2dce32
Коммит
a5d6944f3c
|
@ -860,6 +860,10 @@ ifeq (,$(filter WINCE WINNT OS2,$(OS_ARCH)))
|
|||
RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
RUN_TEST_PROGRAM = $(topsrcdir)/testing/xpcshell/test_os2.cmd "$(DIST)"
|
||||
endif
|
||||
|
||||
#
|
||||
# Java macros
|
||||
#
|
||||
|
|
|
@ -155,9 +155,13 @@ else
|
|||
FWDSLASH_TOPSRCDIR := $(topsrcdir)
|
||||
ifeq ($(HOST_OS_ARCH),WINNT)
|
||||
NATIVE_TOPSRCDIR := $(subst /,\\,$(WIN_TOP_SRC))
|
||||
else
|
||||
else
|
||||
ifeq ($(HOST_OS_ARCH),os2-emx)
|
||||
NATIVE_TOPSRCDIR := $(subst /,\\,$(topsrcdir))
|
||||
else
|
||||
NATIVE_TOPSRCDIR := $(topsrcdir)
|
||||
endif
|
||||
endif
|
||||
endif # CYGWIN_WRAPPER
|
||||
|
||||
testxpcsrcdir = $(topsrcdir)/testing/xpcshell
|
||||
|
|
|
@ -860,6 +860,10 @@ ifeq (,$(filter WINCE WINNT OS2,$(OS_ARCH)))
|
|||
RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
RUN_TEST_PROGRAM = $(topsrcdir)/testing/xpcshell/test_os2.cmd "$(DIST)"
|
||||
endif
|
||||
|
||||
#
|
||||
# Java macros
|
||||
#
|
||||
|
|
|
@ -155,9 +155,13 @@ else
|
|||
FWDSLASH_TOPSRCDIR := $(topsrcdir)
|
||||
ifeq ($(HOST_OS_ARCH),WINNT)
|
||||
NATIVE_TOPSRCDIR := $(subst /,\\,$(WIN_TOP_SRC))
|
||||
else
|
||||
else
|
||||
ifeq ($(HOST_OS_ARCH),os2-emx)
|
||||
NATIVE_TOPSRCDIR := $(subst /,\\,$(topsrcdir))
|
||||
else
|
||||
NATIVE_TOPSRCDIR := $(topsrcdir)
|
||||
endif
|
||||
endif
|
||||
endif # CYGWIN_WRAPPER
|
||||
|
||||
testxpcsrcdir = $(topsrcdir)/testing/xpcshell
|
||||
|
|
Загрузка…
Ссылка в новой задаче