From e23a88afad10600ffcafb359b43c31e20791dcf9 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 29 Apr 2017 17:39:33 +0300 Subject: Fix standard version stub to differ from empty version --- tests/standard-version/driver.cxx | 2 +- tests/standard-version/testscript | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'tests/standard-version') diff --git a/tests/standard-version/driver.cxx b/tests/standard-version/driver.cxx index 677ea8e..943bd31 100644 --- a/tests/standard-version/driver.cxx +++ b/tests/standard-version/driver.cxx @@ -147,7 +147,7 @@ try string s; while (getline (cin, s)) - cout << version (s) << endl; + cout << (s.empty () ? standard_version () : version (s)) << endl; return 0; } diff --git a/tests/standard-version/testscript b/tests/standard-version/testscript index 6a585a5..ebc24d5 100644 --- a/tests/standard-version/testscript +++ b/tests/standard-version/testscript @@ -60,6 +60,12 @@ 0 0+1 EOF + + : empty + : + $* <>EOF + + EOF } : invalid @@ -161,7 +167,6 @@ $* '1.2.3-a.0.1' >y: snapshot $* '1.2.3-' >y: earliest $* '0' >n: stub - } : beta @@ -211,12 +216,6 @@ $* '1.2.3-a.0.1' '1.2.3-' >'1' : snapshot-gt-earliest $* '1.2.2-b.499.z' '1.2.3-' >'-1' : prev-max-snapshot-lt-earliest } - - : stub - : - { - $* '0+1' '0.0.1-' >'-1' : stub-lt-earliest - } } : constraints -- cgit v1.1