From 1d39bc43dcac352e173994353a2fc826a7b74bf3 Mon Sep 17 00:00:00 2001
From: Serhii Turivnyi <sturivny@redhat.com>
Date: Mar 28 2018 10:27:41 +0000
Subject: Change priority of running beakerlib tests


Will be called `make run` command if there is Makefile
then will be called `/bin/sh -e ./runtest.sh` command

https://pagure.io/standard-test-roles/issue/60

---

diff --git a/roles/standard-test-beakerlib/tasks/main.yml b/roles/standard-test-beakerlib/tasks/main.yml
index 3bdf77b..f4d4e06 100644
--- a/roles/standard-test-beakerlib/tasks/main.yml
+++ b/roles/standard-test-beakerlib/tasks/main.yml
@@ -82,10 +82,10 @@
          /bin/sh -e ./$(basename {{ item }})
       elif [ -d {{ item }} ]; then
         cd {{ item }}
-        if [ -f runtest.sh ]; then
-          /bin/sh -e ./runtest.sh
-        elif [ -f Makefile ]; then
+        if [ -f Makefile ]; then
           make run
+        elif [ -f runtest.sh ]; then
+          /bin/sh -e ./runtest.sh
         else
           echo "FAIL don't know how to run test {{ item }}"
         fi