ソースを参照

Make runtest.sh exit status consistent solves #249

Yann Weber 7年前
コミット
fa8bf06f15
3個のファイルの変更13行の追加5行の削除
  1. 5
    2
      progs/slim/install_model/loader.py
  2. 5
    2
      runtest.sh
  3. 3
    1
      runtest_context.sh

+ 5
- 2
progs/slim/install_model/loader.py ファイルの表示

72
         else:
72
         else:
73
             dpath = '.'
73
             dpath = '.'
74
         with open(sys.argv[1]+'/context_tests.log', 'w') as logfile:
74
         with open(sys.argv[1]+'/context_tests.log', 'w') as logfile:
75
-            unittest.TextTestRunner(
75
+            tests_res = unittest.TextTestRunner(
76
                 logfile,
76
                 logfile,
77
                 failfast = '-f' in sys.argv,
77
                 failfast = '-f' in sys.argv,
78
                 verbosity = 2 if '-v' in sys.argv else 1).run(suite)
78
                 verbosity = 2 if '-v' in sys.argv else 1).run(suite)
79
-        exit()
79
+        if tests_res.wasSuccessful():
80
+            exit(0)
81
+        else:
82
+            exit(1)
80
 
83
 
81
     lodel = LodelContext.get()
84
     lodel = LodelContext.get()
82
     import leapi_dyncode as dyncode
85
     import leapi_dyncode as dyncode

+ 5
- 2
runtest.sh ファイルの表示

63
 fi
63
 fi
64
 
64
 
65
 PYTHON='env python3'
65
 PYTHON='env python3'
66
-$PYTHON ./nocontext_tests.py $logdir $@
67
-./runtest_context.sh $logdir $@
66
+ret_status=0
67
+
68
+$PYTHON ./nocontext_tests.py $logdir $@ || ret_status=1
69
+./runtest_context.sh $logdir $@ || ret_status=1
68
 
70
 
69
 if [[ $logdisplay -eq 1 || $logdisplay -eq 2 ]]
71
 if [[ $logdisplay -eq 1 || $logdisplay -eq 2 ]]
70
 then
72
 then
79
     fi
81
     fi
80
 fi
82
 fi
81
 
83
 
84
+exit $ret_status

+ 3
- 1
runtest_context.sh ファイルの表示

70
 rm -R conf.d && mv tests/tests_conf.d conf.d
70
 rm -R conf.d && mv tests/tests_conf.d conf.d
71
 make
71
 make
72
 make refresh_plugins
72
 make refresh_plugins
73
-$PYTHON loader.py $@
73
+$PYTHON loader.py $@ && ret_status=0 || ret_status=1
74
 
74
 
75
 rm -Rf $testdir
75
 rm -Rf $testdir
76
+
77
+exit $ret_status

読み込み中…
キャンセル
保存