Change the target for the qmake/qconf based unit tests to be

"make test", to match cmake.


svn path=/trunk/kdesupport/qca/; revision=685629

unittest/base64unittest/base64unittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = base64unittest
+test.depends = base64unittest
-check.commands = ./base64unittest
+test.commands = ./base64unittest
 
 # Input
 SOURCES += base64unittest.cpp

unittest/bigintunittest/bigintunittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = bigintunittest
+test.depends = bigintunittest
-check.commands = ./bigintunittest
+test.commands = ./bigintunittest
 
 # Input
 SOURCES += bigintunittest.cpp

unittest/certunittest/certunittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = certunittest
+test.depends = certunittest
-check.commands = ./certunittest
+test.commands = ./certunittest
 
 # Input
 SOURCES += certunittest.cpp

unittest/checkall

@@ -1,21 +1,21 @@
 #!/bin/sh
 export LD_LIBRARY_PATH="../../lib:$LD_LIBRARY_PATH"
-cd base64unittest && make check && cd .. && \
+cd base64unittest && make test && cd .. && \
-cd bigintunittest && make check && cd .. && \
+cd bigintunittest && make test && cd .. && \
-cd certunittest && make check && cd .. && \
+cd certunittest && make test && cd .. && \
-cd cipherunittest && make check && cd .. && \
+cd cipherunittest && make test && cd .. && \
-cd clientplugin && make check && cd .. && \
+cd clientplugin && make test && cd .. && \
-cd dsaunittest && make check && cd .. && \
+cd dsaunittest && make test && cd .. && \
-cd hashunittest && make check && cd .. && \
+cd hashunittest && make test && cd .. && \
-cd hexunittest && make check && cd .. && \
+cd hexunittest && make test && cd .. && \
-cd kdfunittest && make check && cd .. && \
+cd kdfunittest && make test && cd .. && \
-cd keygenunittest && make check && cd .. && \
+cd keygenunittest && make test && cd .. && \
-cd keylengthunittest && make check && cd .. && \
+cd keylengthunittest && make test && cd .. && \
-cd macunittest && make check && cd .. && \
+cd macunittest && make test && cd .. && \
-cd pkits && make check && cd .. && \
+cd pkits && make test && cd .. && \
-cd randomunittest && make check && cd .. && \
+cd randomunittest && make test && cd .. && \
-cd rsaunittest && make check && cd .. && \
+cd rsaunittest && make test && cd .. && \
-cd securearrayunittest && make check && cd .. && \
+cd securearrayunittest && make test && cd .. && \
-cd staticunittest && make check && cd .. && \
+cd staticunittest && make test && cd .. && \
-cd symmetrickeyunittest && make check && cd .. && \
+cd symmetrickeyunittest && make test && cd .. && \
-cd tls && make check && cd .. 
+cd tls && make test && cd .. 

unittest/cipherunittest/cipherunittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = cipherunittest
+test.depends = cipherunittest
-check.commands = ./cipherunittest
+test.commands = ./cipherunittest
 
 # Input
 SOURCES += cipherunittest.cpp

unittest/clientplugin/clientplugin.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = clientplugin
+test.depends = clientplugin
-check.commands = ./clientplugin
+test.commands = ./clientplugin
 
 # Input
 SOURCES += clientplugin.cpp

unittest/cms/cms.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = cms
+test.depends = cms
-check.commands = ./cms
+test.commands = ./cms
 
 # Input
 SOURCES += cms.cpp

unittest/dsaunittest/dsaunittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = dsaunittest
+test.depends = dsaunittest
-check.commands = ./dsaunittest
+test.commands = ./dsaunittest
 
 # Input
 SOURCES += dsaunittest.cpp

unittest/filewatchunittest/filewatchunittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = filewatchunittest
+test.depends = filewatchunittest
-check.commands = ./filewatchunittest
+test.commands = ./filewatchunittest
 
 # Input
 HEADERS += filewatchunittest.h

unittest/hashunittest/hashunittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = hashunittest
+test.depends = hashunittest
-check.commands = ./hashunittest
+test.commands = ./hashunittest
 
 # Input
 SOURCES += hashunittest.cpp

unittest/hexunittest/hexunittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = hexunittest
+test.depends = hexunittest
-check.commands = ./hexunittest
+test.commands = ./hexunittest
 
 # Input
 SOURCES += hexunittest.cpp

unittest/kdfunittest/kdfunittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = kdfunittest
+test.depends = kdfunittest
-check.commands = ./kdfunittest
+test.commands = ./kdfunittest
 
 # Input
 SOURCES += kdfunittest.cpp

unittest/keybundle/keybundle.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = keybundle
+test.depends = keybundle
-check.commands = ./keybundle
+test.commands = ./keybundle
 
 # Input
 SOURCES += keybundle.cpp

unittest/keygenunittest/keygenunittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = keygenunittest
+test.depends = keygenunittest
-check.commands = ./keygenunittest
+test.commands = ./keygenunittest
 
 # Input
 SOURCES += keygenunittest.cpp

unittest/keylengthunittest/keylengthunittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = keylengthunittest
+test.depends = keylengthunittest
-check.commands = ./keylengthunittest
+test.commands = ./keylengthunittest
 
 # Input
 SOURCES += keylengthunittest.cpp

unittest/keystore/keystore.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = keystore
+test.depends = keystore
-check.commands = ./keystore
+test.commands = ./keystore
 
 # Input
 SOURCES += keystore.cpp

unittest/logger/logger.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = loggerunittest
+test.depends = loggerunittest
-check.commands = ./loggerunittest
+test.commands = ./loggerunittest
 
 # Input
 SOURCES += loggerunittest.cpp

unittest/macunittest/macunittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = macunittest
+test.depends = macunittest
-check.commands = ./macunittest
+test.commands = ./macunittest
 
 # Input
 SOURCES += macunittest.cpp

unittest/metatype/metatype.pro

@@ -3,10 +3,10 @@ include(../unittest.pri)
 CONFIG += qtestlib
 TARGET = metatypeunittest
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = metatypeunittest
+test.depends = metatypeunittest
-check.commands = ./metatypeunittest
+test.commands = ./metatypeunittest
 
 # Input
 SOURCES += metatype.cpp

unittest/pgpunittest/pgpunittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = pgpunittest
+test.depends = pgpunittest
-check.commands = ./pgpunittest
+test.commands = ./pgpunittest
 
 # Input
 SOURCES += pgpunittest.cpp

unittest/pkits/pkits.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = pkits
+test.depends = pkits
-check.commands = ./pkits
+test.commands = ./pkits
 
 # Input
 SOURCES += pkits.cpp

unittest/randomunittest/randomunittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = randomunittest
+test.depends = randomunittest
-check.commands = ./randomunittest
+test.commands = ./randomunittest
 
 # Input
 SOURCES += randomunittest.cpp

unittest/rsaunittest/rsaunittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = rsaunittest
+test.depends = rsaunittest
-check.commands = ./rsaunittest
+test.commands = ./rsaunittest
 
 # Input
 SOURCES += rsaunittest.cpp

unittest/securearrayunittest/securearrayunittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = securearrayunittest
+test.depends = securearrayunittest
-check.commands = ./securearrayunittest
+test.commands = ./securearrayunittest
 
 # Input
 SOURCES += securearrayunittest.cpp

unittest/staticunittest/staticunittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = staticunittest
+test.depends = staticunittest
-check.commands = ./staticunittest
+test.commands = ./staticunittest
 
 # Input
 SOURCES += staticunittest.cpp

unittest/symmetrickeyunittest/symmetrickeyunittest.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = symmetrickeyunittest
+test.depends = symmetrickeyunittest
-check.commands = ./symmetrickeyunittest
+test.commands = ./symmetrickeyunittest
 
 # Input
 SOURCES += symmetrickeyunittest.cpp

unittest/tls/tls.pro

@@ -2,10 +2,10 @@ DEPENDPATH += .
 include(../unittest.pri)
 CONFIG += qtestlib
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = tlsunittest
+test.depends = tlsunittest
-check.commands = ./tlsunittest
+test.commands = ./tlsunittest
 
 # Input
 SOURCES += tlsunittest.cpp

unittest/unittest.pro

@@ -20,6 +20,7 @@ SUBDIRS += \
 	macunittest \
 	metatype \
 #	pgpunittest \
+#	pipeunittest \
 	pkits \
 	randomunittest \
 	rsaunittest \
@@ -29,6 +30,6 @@ SUBDIRS += \
 	tls \
 	velox
 
-QMAKE_EXTRA_TARGETS += check
+QMAKE_EXTRA_TARGETS += test
-check.commands = sh ./checkall
+test.commands = sh ./checkall
 

unittest/velox/velox.pro

@@ -3,10 +3,10 @@ include(../unittest.pri)
 CONFIG += qtestlib
 QT += network
 
-# check target
+# test target
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS = test
-check.depends = veloxunittest
+test.depends = veloxunittest
-check.commands = ./veloxunittest
+test.commands = ./veloxunittest
 
 # Input
 SOURCES += veloxunittest.cpp