Guest User

Untitled

a guest
Jun 19th, 2018
197
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.81 KB | None | 0 0
  1. commit a001d6e92de5476e187bce6078ccff968c637a29
  2. Author: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
  3. Date: Wed Oct 27 16:18:28 2010 +0200
  4.  
  5. foo
  6.  
  7. diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
  8. index 01d5cd5..00a1b37 100644
  9. --- a/tests/benchmarks/benchmarks.pro
  10. +++ b/tests/benchmarks/benchmarks.pro
  11. @@ -7,3 +7,6 @@ SUBDIRS = \
  12. svg
  13. contains(QT_CONFIG, opengl): SUBDIRS += opengl
  14. contains(QT_CONFIG, declarative): SUBDIRS += declarative
  15. +
  16. +check-trusted.CONFIG += recursive
  17. +QMAKE_EXTRA_TARGETS += check-trusted
  18. diff --git a/tests/benchmarks/corelib/corelib.pro b/tests/benchmarks/corelib/corelib.pro
  19. index 8a6941b..335280e 100644
  20. --- a/tests/benchmarks/corelib/corelib.pro
  21. +++ b/tests/benchmarks/corelib/corelib.pro
  22. @@ -4,5 +4,13 @@ SUBDIRS = \
  23. kernel \
  24. thread \
  25. tools \
  26. - codecs \
  27. + codecs \
  28. plugin
  29. +
  30. +TRUSTED_BENCHMARKS += \
  31. + kernel/qmetaobject \
  32. + kernel/qmetatype \
  33. + kernel/qobject \
  34. + thread/qthreadstorage
  35. +
  36. +include(../trusted-benchmarks.pri)
  37. \ No newline at end of file
  38. diff --git a/tests/benchmarks/declarative/declarative.pro b/tests/benchmarks/declarative/declarative.pro
  39. index 5dd31f3..cb02a35 100644
  40. --- a/tests/benchmarks/declarative/declarative.pro
  41. +++ b/tests/benchmarks/declarative/declarative.pro
  42. @@ -12,4 +12,4 @@ SUBDIRS += \
  43.  
  44. contains(QT_CONFIG, opengl): SUBDIRS += painting
  45.  
  46. -
  47. +include(../trusted-benchmarks.pri)
  48. diff --git a/tests/benchmarks/gui/gui.pro b/tests/benchmarks/gui/gui.pro
  49. index 946f184..d825458 100644
  50. --- a/tests/benchmarks/gui/gui.pro
  51. +++ b/tests/benchmarks/gui/gui.pro
  52. @@ -9,3 +9,10 @@ SUBDIRS = \
  53. painting \
  54. styles \
  55. text
  56. +
  57. +TRUSTED_BENCHMARKS += \
  58. + graphicsview/functional/GraphicsViewBenchmark \
  59. + graphicsview/qgraphicsview \
  60. + painting/qtracebench
  61. +
  62. +include(../trusted-benchmarks.pri)
  63. \ No newline at end of file
  64. diff --git a/tests/benchmarks/network/network.pro b/tests/benchmarks/network/network.pro
  65. index 73de556..692a0a1 100644
  66. --- a/tests/benchmarks/network/network.pro
  67. +++ b/tests/benchmarks/network/network.pro
  68. @@ -4,3 +4,10 @@ SUBDIRS = \
  69. kernel \
  70. ssl \
  71. socket
  72. +
  73. +TRUSTED_BENCHMARKS += \
  74. + kernel/qhostinfo \
  75. + socket/qtcpserver \
  76. + ssl/qsslsocket
  77. +
  78. +include(../trusted-benchmarks.pri)
  79. \ No newline at end of file
  80. diff --git a/tests/benchmarks/opengl/opengl.pro b/tests/benchmarks/opengl/opengl.pro
  81. index 5c58751..b510c2b 100644
  82. --- a/tests/benchmarks/opengl/opengl.pro
  83. +++ b/tests/benchmarks/opengl/opengl.pro
  84. @@ -8,3 +8,5 @@ QT += opengl
  85.  
  86. # Input
  87. SOURCES += main.cpp
  88. +
  89. +include(../trusted-benchmarks.pri)
  90. \ No newline at end of file
  91. diff --git a/tests/benchmarks/script/script.pro b/tests/benchmarks/script/script.pro
  92. index 8d689b6..34910f7 100644
  93. --- a/tests/benchmarks/script/script.pro
  94. +++ b/tests/benchmarks/script/script.pro
  95. @@ -3,3 +3,10 @@ SUBDIRS = \
  96. qscriptclass \
  97. qscriptengine \
  98. qscriptvalue
  99. +
  100. +TRUSTED_BENCHMARKS += \
  101. + qscriptclass \
  102. + qscriptvalue \
  103. + qscriptengine
  104. +
  105. +include(../trusted-benchmarks.pri)
  106. \ No newline at end of file
  107. diff --git a/tests/benchmarks/svg/svg.pro b/tests/benchmarks/svg/svg.pro
  108. index cdc2ca5..d84eb71 100644
  109. --- a/tests/benchmarks/svg/svg.pro
  110. +++ b/tests/benchmarks/svg/svg.pro
  111. @@ -1,3 +1,5 @@
  112. TEMPLATE = subdirs
  113. SUBDIRS = \
  114. qsvgrenderer
  115. +
  116. +include(../trusted-benchmarks.pri)
  117. \ No newline at end of file
  118. diff --git a/tests/benchmarks/trusted-benchmarks.pri b/tests/benchmarks/trusted-benchmarks.pri
  119. new file mode 100644
  120. index 0000000..632dcff
  121. --- /dev/null
  122. +++ b/tests/benchmarks/trusted-benchmarks.pri
  123. @@ -0,0 +1,8 @@
  124. +# Edit the list of trusted benchmarks in each of the sub-targets
  125. +
  126. +check-trusted.depends = qmake
  127. +for(benchmark, TRUSTED_BENCHMARKS) {
  128. + check-trusted.commands += (cd $$benchmark && $(MAKE) -f $(MAKEFILE) check);
  129. +}
  130. +
  131. +QMAKE_EXTRA_TARGETS += check-trusted
Add Comment
Please, Sign In to add comment