Merge branch 'linux-debug-run-old-commits' into linux

- old commits compile and run as expected
- includes files for testing the linux branch (german strings)
- tests improved to fail if ctp2 segfaults

.civctp2/save/games/Julius/Julius-Roma-3450BC

@@ -0,0 +1 @@
+Julius-R�me-3450v.Chr.

.civctp2/userprofile.txt

@@ -71,13 +71,11 @@ AlienEndGame=Yes
 UnitCompleteMessages=Yes
 NonContinuousUnitCompleteMessages=Yes
 DebugSlic=Yes
-DebugSlicEvents=No
 DiplomacyLog=No
 CheatAge=0
 DontKillMessages=No
 AIPopCheat=Yes
 ShowCityNames=Yes
-ShowArmyNames=No
 ShowTradeRoutes=Yes
 UnitSpeed=1
 MouseSpeed=5
@@ -99,7 +97,6 @@ AutoOpenCityWindow=Yes
 ShowEnemyHealth=Yes
 ShowCityInfluence=Yes
 ShowPoliticalBorders=Yes
-GoodRichness=50
 EndTurnSound=Yes
 EnableLogs=Yes
 DisplayUnits=Yes
@@ -108,43 +105,9 @@ DisplayBorders=Yes
 DisplayFilter=Yes
 DisplayTrade=Yes
 DisplayTerrain=Yes
-DisplayPolitical=No
-DisplayCapitols=No
-DisplayRelations=No
 CloseOnEyepoint=No
 ShowExpensive=No
 ColorSet=0
 ShowOrderUnion=No
 RecentAtTop=No
 RuleSets=
-CityClick=No
-EndTurnWithEmptyBuildQueues=No
-RunInBackground=No
-AutoExpireTreatyBase=-1
-CityCaptureOptions=No
-Upgrade=No
-SmoothBorders=No
-CivFlags=Yes
-AICityDefenderBonus=No
-BarbarianCities=No
-SectarianHappiness=No
-RevoltCasualties=No
-RevoltInsurgents=No
-BarbarianCamps=No
-BarbarianSpawnsBarbarian=No
-AINoSinking=No
-GoldPerUnitSupport=No
-GoldPerCity=No
-AIMilitiaUnit=No
-OneCityChallenge=No
-EnergySupply&DemandRatio=No
-ShowDebugAI=No
-CitiesLeaveRuins=No
-NoCityLimit=No
-DebugCityAstar=No
-NewCombat=Yes
-NoGoodyHuts=No
-RandomCustomMap=No
-SPStartingAge=0
-SPEndingAge=9
-ShowCityProduction=Yes

.gitlab-ci.yml

@@ -87,7 +87,7 @@ test:ss_new:
     - pidX=$!
     - sleep 3
     - docker pull $IMAGE_TAG:test
-    - docker run --env DISPLAY -v ${SHARED_PATH}/.X11-unix/:/tmp/.X11-unix/ $IMAGE_TAG:test ./ctp2 nointromovie &
+    - docker run --env DISPLAY -v ${SHARED_PATH}/.X11-unix/:/tmp/.X11-unix/ -v $(pwd)/.civctp2/userprofile.txt:/opt/ctp2/ctp2_program/ctp/userprofile.txt -v $(pwd)/.civctp2/save/:/opt/ctp2/ctp2_program/ctp/save/ $IMAGE_TAG:test ./ctp2 nointromovie &
     - pidD=$!
     - java -cp "/opt/sikulixapi.jar:/opt/jython-standalone-2.7.1.jar" org.python.util.jython tests/new-game.sikuli/new-game.py
     - kill $pidD
@@ -129,3 +129,4 @@ release:
     - docker push $IMAGE_TAG:latest
   only:
     - master
+    - linux

Dockerfile

@@ -43,8 +43,8 @@ COPY ctp2CD/ /opt/ctp2/
 
 RUN cd /ctp2 && \
     make bootstrap && \
-    LD_LIBRARY_PATH="/usr/lib/i386-linux-gnu/" \
-    CFLAGS="-fpermissive -Wl,--no-as-needed -m32" \
+    LD_LIBRARY_PATH="${LD_LIBRARY_PATH} /usr/lib/i386-linux-gnu/" \
+    CFLAGS="-Wl,--no-as-needed -m32" \
     CXXFLAGS="-fpermissive -Wl,--no-as-needed -m32" \
     ./configure --prefix=/opt/ctp2 --bindir=/opt/ctp2/ctp2_program/ctp --enable-silent-rules && \
     make && \

tests/load-game.sikuli/load-game.py

@@ -16,13 +16,21 @@ def main():
     click("ctp2Julius-Roma-file.png")
     click(Pattern("ctp2OK-btn.png").similar(0.99))
     if exists("ctp2ctr-bar.png", 100):
-        waitVanish("ctp2progress-bar.png", 100) # control bar appears before progressbar vanishes
-        file = capture(SCREEN.getBounds())
-        print("Saved screen as "+file)
-        shutil.move(file, 'ctp2load-game.png')
-        exit(0)
+        if waitVanish("ctp2progress-bar.png", 100): # control bar appears before progressbar vanishes
+            file = capture(SCREEN.getBounds())
+            if file:
+                f= Finder(file) # http://doc.sikuli.org/finder.html
+                f.find("ctp2ctr-bar.png")
+                if not f.hasNext():
+                    print("Pattern not found in screen shot: " + file)
+                    exit(30)
+                shutil.move(file, 'ctp2load-game.png')
+                exit(0)
+        else:
+            exit(20)
     else:
         exit(10)
+    exit(99)
 
 if __name__ == "__main__":
     main()

tests/new-game.sikuli/new-game.py

@@ -14,13 +14,21 @@ def main():
     click("ctp2new-game-btn.png")
     click("ctp2launch-btn.png")
     if exists("ctp2ctr-bar.png", 100):
-        waitVanish("ctp2progress-bar.png", 100) # control bar appears before progressbar vanishes
-        file = capture(SCREEN.getBounds())
-        print("Saved screen as "+file)
-        shutil.move(file, 'ctp2new-game.png')
-        exit(0)
+        if waitVanish("ctp2progress-bar.png", 100): # control bar appears before progressbar vanishes
+            file = capture(SCREEN.getBounds())
+            if file:
+                f= Finder(file) # http://doc.sikuli.org/finder.html
+                f.find("ctp2ctr-bar.png")
+                if not f.hasNext():
+                    print("Pattern not found in screen shot: " + file)
+                    exit(30)
+                shutil.move(file, 'ctp2new-game.png')
+                exit(0)
+        else:
+            exit(20)
     else:
         exit(10)
+    exit(99)
 
 if __name__ == "__main__":
     main()

tests/start-game.sikuli/start-game.py

@@ -12,11 +12,17 @@
 def main():
     if exists("ctp2start-scr.png", 100):
         file = capture(SCREEN.getBounds())
-        print("Saved screen as "+file)
-        shutil.move(file, 'ctp2start.png')
-        exit(0)
+        if file:
+            f= Finder(file) # http://doc.sikuli.org/finder.html
+            f.find("ctp2start-scr.png")
+            if not f.hasNext():
+                print("Pattern not found in screen shot: " + file)
+                exit(30)
+            shutil.move(file, 'ctp2start.png')
+            exit(0)
     else:
         exit(10)
+    exit(99)
 
 if __name__ == "__main__":
     main()