From 3dc4d2fcc4e00ec172c08d53b3100e7a5c8c2d0a Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 22 Dec 2016 13:33:50 +0000 Subject: [PATCH] .autotest git-svn-id: svn://ultimatepp.org/upp/trunk@10566 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- autotest/CheckBak/CheckBak.cpp | 12 +++++------- autotest/RangeCoLoop/RangeCoLoop.cpp | 2 ++ autotest/RangeCoLoop/RangeCoLoop.upp | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/autotest/CheckBak/CheckBak.cpp b/autotest/CheckBak/CheckBak.cpp index 8bb7f61e0..a8e6aeaeb 100644 --- a/autotest/CheckBak/CheckBak.cpp +++ b/autotest/CheckBak/CheckBak.cpp @@ -8,16 +8,14 @@ void GetRepoInfo(String repo, Date& d, int& rev) LOG("SVN info:"); LOG(s); - String key = "Revision: "; - int q = s.Find(key); + int q = s.FindAfter("Last Changed Rev: "); ASSERT(q >= 0); - rev = atoi(s.Mid(q + key.GetCount())); + rev = atoi(~s + q); ASSERT(rev > 0); - key = "Last Changed Date: "; - q = s.Find(key); + q = s.FindAfter("Last Changed Date: "); ASSERT(q >= 0); - s = s.Mid(q + key.GetCount()); + s = s.Mid(q); ASSERT(s.GetCount() > 18); // 2014-10-30 01:01:56 @@ -46,7 +44,7 @@ CONSOLE_APP_MAIN ASSERT(d == d1 && rev == rev1); - GetRepoInfo("svn://www.ultimatepp.org/upp/trunk", d, rev); + GetRepoInfo("svn://www.ultimatepp.org/upp/trunk/uppsrc", d, rev); LOG("upp.src revision: " << rev); String h = HttpRequest("https://github.com/ultimatepp/mirror/commits/master").Execute(); diff --git a/autotest/RangeCoLoop/RangeCoLoop.cpp b/autotest/RangeCoLoop/RangeCoLoop.cpp index c2a45988a..46a5abce3 100644 --- a/autotest/RangeCoLoop/RangeCoLoop.cpp +++ b/autotest/RangeCoLoop/RangeCoLoop.cpp @@ -5,6 +5,8 @@ using namespace Upp; CONSOLE_APP_MAIN { StdLogSetup(LOG_COUT|LOG_FILE); + + TimeStop tm; Vector x; for(int i = 0; i < 100000000; i++) diff --git a/autotest/RangeCoLoop/RangeCoLoop.upp b/autotest/RangeCoLoop/RangeCoLoop.upp index b7e8a93aa..bff9f20a7 100644 --- a/autotest/RangeCoLoop/RangeCoLoop.upp +++ b/autotest/RangeCoLoop/RangeCoLoop.upp @@ -1,3 +1,5 @@ +description "#WAIT: 10\377"; + uses Core;