TEMPLATE = subdirs
-SUBDIRS = v4 tools
+SUBDIRS = v4
CONFIG += ordered
+++ /dev/null
-TEMPLATE = app
-QT = core v4 v4-private core-private qmldevtools-private
-SOURCES = main.cpp
-
-TARGET = v4
-
-INCLUDEPATH += ../v4
-INCLUDEPATH += ../3rdparty/masm
-INCLUDEPATH += ../3rdparty/masm/wtf
-INCLUDEPATH += ../3rdparty/masm/stubs
-INCLUDEPATH += ../3rdparty/masm/stubs/wtf
-INCLUDEPATH += ../3rdparty/masm/jit
-INCLUDEPATH += ../3rdparty/masm/assembler
-INCLUDEPATH += ../3rdparty/masm/disassembler
-
-DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE=""
-DEFINES += QMLJS_NO_LLVM
-DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0
}
TESTSCRIPT=$$PWD/../../tests/test262.py
-V4CMD = $$OUT_PWD/../tools/v4
+V4CMD = v4
checktarget.target = check
checktarget.commands = python $$TESTSCRIPT --command=$$V4CMD --parallel --with-test-expectations --update-expectations
%modules = ( # path to module name map
- "QtV4" => "$basedir/src",
+ "QtV4" => "$basedir/src/v4",
);
%moduleheaders = ( # restrict the module headers to those found in relative path
- #"QtV4" => "3rdparty/masm;v4;",
+# "QtV4" => "../3rdparty/;../v4;",
);
@allmoduleheadersprivate = (
"QtV4"
def BuildOptions():
result = optparse.OptionParser()
- result.add_option("--command", default=path.abspath(rootDir + "/../v4"), help="The command-line to run")
+ result.add_option("--command", default="v4", help="The command-line to run")
result.add_option("--tests", default=path.abspath(rootDir + '/test262'),
help="Path to the tests")
result.add_option("--cat", default=False, action="store_true",
--- /dev/null
+TEMPLATE = subdirs
+SUBDIRS += v4
--- /dev/null
+TEMPLATE = app
+QT = v4-private core-private qmldevtools-private
+SOURCES = main.cpp
+
+INCLUDEPATH += ../../src/v4
+INCLUDEPATH += ../../src/3rdparty/masm
+INCLUDEPATH += ../../src/3rdparty/masm/wtf
+INCLUDEPATH += ../../src/3rdparty/masm/stubs
+INCLUDEPATH += ../../src/3rdparty/masm/stubs/wtf
+INCLUDEPATH += ../../src/3rdparty/masm/jit
+INCLUDEPATH += ../../src/3rdparty/masm/assembler
+INCLUDEPATH += ../../src/3rdparty/masm/disassembler
+
+DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE=""
+DEFINES += QMLJS_NO_LLVM
+DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0
+
+load(qt_tool)