Various changes to fix build tests

kjlaw89 · Jun 3, 2018 · dba1c93 · dba1c93
1 parent 1396844
commit dba1c93
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,7 +30,6 @@ install:
   - npm install @elementaryos/houston
 
 script:
-  - export DISPLAY=:0
   - houston ci
     --name-domain com.github.kjlaw89.archetype
     --distribution $DIST
diff --git a/app b/app
@@ -23,6 +23,24 @@ function initialize {
     fi
 }
 
+function test {
+    initialize
+
+    export DISPLAY=:0
+    ./com.github.kjlaw89.archetype --run-tests
+    export DISPLAY=":0.0"
+
+    echo ""
+
+    result=$?
+    if [ $result -gt 0 ]; then
+        echo "Failed testing"
+        exit 100
+    fi
+
+    echo "Tests passed!"
+}
+
 case $1 in
 "clean")
     sudo rm -rf ./build
@@ -46,29 +64,21 @@ case $1 in
     fi
 
     replace="sudo apt install"
-    missing=${output/dpkg-checkbuilddeps: error: Unmet build dependencies:/$replace}
+    pattern="(\([>=<0-9. ]+\))+"
+    sudo_replace=${output/dpkg-checkbuilddeps: error: Unmet build dependencies:/$replace}
+    command=$(sed -r -e "s/$pattern//g" <<< "$sudo_replace")
     
-    $missing
+    $command
     ;;
 "run")
     initialize
     ./com.github.kjlaw89.archetype
     ;;
 "test")
-    initialize
-    ninja test
+    test
     ;;
 "test-run")
-    initialize
-    ninja test
-
-    result=$?
-
-    if [ $result -gt 0 ]; then
-        echo "Project built but tests failed"
-        exit 100
-    fi
-
+    test
     ./com.github.kjlaw89.archetype
     ;;
 "uninstall")

diff --git a/data/com.github.kjlaw89.archetype.appdata.xml b/data/com.github.kjlaw89.archetype.appdata.xml
@@ -17,7 +17,43 @@
     </screenshots>
     <description>
         <p>A simple Vala app generator</p>
-    </description>   
+    </description>
+    <releases>
+      <release version="1.0.0" date="2018-06-04">
+        <description>
+          <p>Initial 1.0.0 release!</p>
+        </description>
+      </release>
+    </releases>
+    <content_rating type="oars-1.1">
+      <content_attribute id="violence-cartoon">none</content_attribute>
+      <content_attribute id="violence-fantasy">none</content_attribute>
+      <content_attribute id="violence-realistic">none</content_attribute>
+      <content_attribute id="violence-bloodshed">none</content_attribute>
+      <content_attribute id="violence-sexual">none</content_attribute>
+      <content_attribute id="violence-desecration">none</content_attribute>
+      <content_attribute id="violence-slavery">none</content_attribute>
+      <content_attribute id="violence-worship">none</content_attribute>
+      <content_attribute id="drugs-alcohol">none</content_attribute>
+      <content_attribute id="drugs-narcotics">none</content_attribute>
+      <content_attribute id="drugs-tobacco">none</content_attribute>
+      <content_attribute id="sex-nudity">none</content_attribute>
+      <content_attribute id="sex-themes">none</content_attribute>
+      <content_attribute id="sex-homosexuality">none</content_attribute>
+      <content_attribute id="sex-prostitution">none</content_attribute>
+      <content_attribute id="sex-adultery">none</content_attribute>
+      <content_attribute id="sex-appearance">none</content_attribute>
+      <content_attribute id="language-profanity">none</content_attribute>
+      <content_attribute id="language-humor">none</content_attribute>
+      <content_attribute id="language-discrimination">none</content_attribute>
+      <content_attribute id="social-chat">none</content_attribute>
+      <content_attribute id="social-info">none</content_attribute>
+      <content_attribute id="social-audio">none</content_attribute>
+      <content_attribute id="social-location">none</content_attribute>
+      <content_attribute id="social-contacts">none</content_attribute>
+      <content_attribute id="money-purchasing">none</content_attribute>
+      <content_attribute id="money-gambling">none</content_attribute>
+    </content_rating>
     <url type="homepage">https://kjlaw89.github.io/archetype/</url>
     <url type="bugtracker">https://github.com/kjlaw89/archetype/issues</url>
     <url type="help">https://github.com/kjlaw89/archetype/issues</url>
@@ -27,4 +63,4 @@
         <value key="x-appcenter-color-primary-text">#ECF0F1</value>
         <value key="x-appcenter-suggested-price">1</value>
     </custom>
-</component>
+</component>
diff --git a/meson.build b/meson.build
@@ -47,6 +47,6 @@ e = executable('com.github.kjlaw89.archetype',
     install : true
 )
 
-test('tests', e, args : ['--run-tests'])
+#test('tests', e, args : ['--run-tests'])
 
-meson.add_install_script('meson/post_install.py')
+meson.add_install_script('meson/post_install.py')
diff --git a/src/Main.vala b/src/Main.vala
@@ -50,7 +50,7 @@ public class Main {
         }
 
         if (testing) {
-            Gtk.init (ref args);
+            Gtk.init_check (ref args);
             var testing = new App.Tests.Testing (args);
             Idle.add (() => {
                 testing.run ();