diff -r 839712f5a78c -r 24e4ef208cca sbsv2/raptor/test/smoke_suite/qt_helloworld.py --- a/sbsv2/raptor/test/smoke_suite/qt_helloworld.py Wed Jul 14 16:22:24 2010 +0800 +++ b/sbsv2/raptor/test/smoke_suite/qt_helloworld.py Wed Jul 14 14:50:01 2010 +0100 @@ -15,6 +15,7 @@ # This test case requires install of Qt. from raptor_tests import SmokeTest +import os def run(): t = SmokeTest() @@ -23,7 +24,10 @@ t.id = "0110" t.name = "qt_helloworld" - t.command = "cd smoke_suite/test_resources/qt && qmake -spec symbian-sbsv2 && sbs" + # Internal QT deliveries use a QMAKE launcher that expects EPOCROOT to end in a slash + # We ensure it does (doesn't matter if there are multiple slashes) + t.environ["EPOCROOT"] = os.environ["EPOCROOT"] + os.sep + t.command = "cd smoke_suite/test_resources/qt && $(EPOCROOT)/epoc32/tools/qmake -spec symbian-sbsv2 && sbs" t.targets = [ "$(SBS_HOME)/test/smoke_suite/test_resources/qt/bld.inf", "$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt.loc",