Only run travis on master & stable

ryanflannery · Mar 2, 2016 · 950046f · 950046f
1 parent 2335cb4
commit 950046f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,3 +11,8 @@ before_install:
    - sudo apt-get -qq update
    - sudo apt-get install -y libtaglib2.0
    - sudo apt-get install -y libgstreamer0.9
+
+branches:
+   only:
+      - master
+      - stable
diff --git a/src/util/exe_in_path.t.cc b/src/util/exe_in_path.t.cc
@@ -28,3 +28,8 @@ TEST(exe_in_path, TestRandomChars)
 {
    ASSERT_EQ(false, exe_in_path("*!03/;]asdf$FOO"));
 }
+
+TEST(exe_in_path, TestOpenQuote)
+{
+   ASSERT_EQ(false, exe_in_path("'"));
+}
diff --git a/src/util/str2argv.t.cc b/src/util/str2argv.t.cc
@@ -9,6 +9,18 @@ TEST(argv2str, TestEmpty)
    ASSERT_EQ(NULL, argv2str(0, NULL));
 }
 
+TEST(argv2str, TestMaryHadALittleLamb)
+{
+   char *argv[] = {
+		(char*) "mary",
+		(char*) "had",
+		(char*) "a",
+		(char*) "little",
+		(char*) "lamb"
+	};
+   ASSERT_STREQ("mary had a little lamb ", argv2str(5, argv));
+}
+
 TEST(argv2str, TestSizeTooSmall)
 {
    char *argv[2] = { (char*)"foo", (char*)"bar" };
@@ -26,15 +38,3 @@ TEST(argv2str, TestSizeTooBig)
    char *argv[3] = { (char*)"foo", (char*)"bar", (char*)"baz" };
    ASSERT_STREQ("foo bar ", argv2str(2, argv));
 }
-
-TEST(argv2str, TestMaryHadALittleLamb)
-{
-   char *argv[] = {
-		(char*) "mary",
-		(char*) "had",
-		(char*) "a",
-		(char*) "little",
-		(char*) "lamb"
-	};
-   ASSERT_STREQ("mary had a little lamb ", argv2str(5, argv));
-}