[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[OSSTEST PATCH 2/6] mg-repro-setup: Promote an error test to before builds (nfc)



Signed-off-by: Ian Jackson <iwj@xxxxxxxxxxxxxx>
---
 mg-repro-setup | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/mg-repro-setup b/mg-repro-setup
index 374176f03..56d27d4ef 100755
--- a/mg-repro-setup
+++ b/mg-repro-setup
@@ -253,6 +253,15 @@ while [ $# -ne 0 ]; do
        esac
 done
 
+if [ "${alloc_idents[*]}" ]; then
+        if [ x"$OSSTEST_TASK" = x ]; then
+                # We would have to make a dynamic task and hold the
+                #  fd for it in this script.  Would be quite awkward.
+                echo >&2 'cannot hand-allocate in a way that will free'
+                exit 1
+        fi
+fi
+
 flight=$(./cs-adjust-flight new:$blessing)
 progress "new flight is $flight"
 
@@ -281,13 +290,6 @@ if $statictask; then
 fi
 
 if [ "${alloc_idents[*]}" ]; then
-        if [ x"$OSSTEST_TASK" = x ]; then
-                # We would have to make a dynamic task and hold the
-                #  fd for it in this script.  Would be quite awkward.
-                echo >&2 'cannot hand-allocate in a way that will free'
-                exit 1
-        fi
-
        progress "allocating ${alloc_idents[*]} ..."
        alloc_output=tmp/$flight.allocations
        ./mg-allocate \
-- 
2.20.1




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.