build: ci fix

* test paths changed
* moving javatest to the back caused sometimes error if run before other test
This commit is contained in:
Andreas Stallinger
2017-02-07 13:06:47 +01:00
parent d988af2ea9
commit bb4cc9662c
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -9,7 +9,7 @@ Linux64:
- ./script/buildonly.sh package - ./script/buildonly.sh package
- ./build/Release/app/Coati --licenseFile ./setup/license.txt - ./build/Release/app/Coati --licenseFile ./setup/license.txt
- cd ./bin/test - cd ./bin/test
- ../../Release/build/Coati_test - ../../build/Release/test/Coati_test
artifacts: artifacts:
paths: paths:
- distr/Coati*.tar.gz - distr/Coati*.tar.gz
@@ -26,7 +26,7 @@ Linux32:
- ./script/buildonly.sh package - ./script/buildonly.sh package
- ./build/Release/app/Coati --licenseFile ./setup/license.txt - ./build/Release/app/Coati --licenseFile ./setup/license.txt
- cd ./bin/test - cd ./bin/test
- ../../Release/build/Coati_test - ../../build/Release/test/Coati_test
artifacts: artifacts:
paths: paths:
- distr/Coati*.tar.gz - distr/Coati*.tar.gz
+2 -2
View File
@@ -16,12 +16,11 @@ add_files(
FileSystemTestSuite.h FileSystemTestSuite.h
GeneratorTestSuite.h GeneratorTestSuite.h
GraphTestSuite.h GraphTestSuite.h
JavaParserTestSuite.h
LogManagerTestSuite.h LogManagerTestSuite.h
MatrixBaseTestSuite.h MatrixBaseTestSuite.h
MessageQueueTestSuite.h MessageQueueTestSuite.h
NetworkProtocolHelperTestSuite.h NetworkProtocolHelperTestSuite.h
SettingsTestSuite.h SettingsTestSuite.h
SettingsMigratorTestSuite.h SettingsMigratorTestSuite.h
SearchIndexTestSuite.h SearchIndexTestSuite.h
SqliteStorageTestSuite.h SqliteStorageTestSuite.h
@@ -31,4 +30,5 @@ add_files(
TokenLocationCollectionTestSuite.h TokenLocationCollectionTestSuite.h
UtilityStringTestSuite.h UtilityStringTestSuite.h
Vector2TestSuite.h Vector2TestSuite.h
JavaParserTestSuite.h
) )