From 4a9790b9d8262f44bd42bfe9af0860873725b32b Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 9 Aug 2018 21:44:27 +0300 Subject: Fix other command testscripts to pass for older git versions --- tests/config.test | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) (limited to 'tests/config.test') diff --git a/tests/config.test b/tests/config.test index 5e18427..7c03286 100644 --- a/tests/config.test +++ b/tests/config.test @@ -5,12 +5,10 @@ # Note that we test the list sub-command while testing other sub-commands. # -.include common.test git.test project.test +.include common.test project.test cxx = cc "config.cxx=$config.cxx" -snapshot = ($git_supported ? '19700101000000' : 'z') - status += -d prj init += -d prj update += -d prj @@ -33,10 +31,10 @@ deinit += -d prj $init @cfg 2>>/~"%EOE%"; initializing in project $~/prj/ synchronizing: - % new prj.+$snapshot% + % new prj.+% EOE - $status >"prj configured 0.1.0-a.0.$snapshot"; + $status >~'%prj configured 0\.1\.0-a\.0\..+%'; $* list @cfg >>/"EOO"; @cfg $~/cfg-dir/ 1 default,forwarded,auto-synchronized @@ -67,10 +65,10 @@ deinit += -d prj $init @cfg 2>>/~"%EOE%"; initializing in project $~/prj/ synchronizing: - % new prj.+$snapshot% + % new prj.+% EOE - $status >"prj configured 0.1.0-a.0.$snapshot"; + $status >~'%prj configured 0\.1\.0-a\.0\..+%'; $* list >>/"EOO"; @cfg $~/prj-cfg/ 1 default,forwarded,auto-synchronized @@ -101,10 +99,10 @@ deinit += -d prj $init -c cfg 2>>/~"%EOE%"; initializing in project $~/prj/ synchronizing: - % new prj.+$snapshot% + % new prj.+% EOE - $status >"prj configured 0.1.0-a.0.$snapshot"; + $status >~'%prj configured 0\.1\.0-a\.0\..+%'; $* list >>/"EOO"; $~/cfg/ 1 default,forwarded,auto-synchronized @@ -164,19 +162,19 @@ deinit += -d prj initializing in project $~/prj/ in configuration @cfg1: synchronizing: - % new prj.+$snapshot% + % new prj.+% in configuration @cfg2: synchronizing: - % new prj.+$snapshot% + % new prj.+% EOE - $status --all >>"EOO"; + $status --all >>~%EOO%; in configuration @cfg1: - prj configured 0.1.0-a.0.$snapshot + %prj configured 0\.1\.0-a\.0\..+% in configuration @cfg2: - prj configured 0.1.0-a.0.$snapshot + %prj configured 0\.1\.0-a\.0\..+% EOO $* list >>/"EOO"; @@ -220,7 +218,7 @@ deinit += -d prj $init @cfg 2>>/~"%EOE%"; initializing in project $~/prj/ synchronizing: - % new prj.+$snapshot% + % new prj.+% EOE mv prj-cfg prj-cfg2; @@ -254,7 +252,7 @@ deinit += -d prj $init @cfg 2>>/~"%EOE%"; initializing in project $~/prj/ synchronizing: - % new prj.+$snapshot% + % new prj.+% EOE $* rename @cfg cfg2 2>>/"EOE"; @@ -302,8 +300,8 @@ deinit += -d prj removed configuration @cfg1 $~/prj-cfg1/ 1 EOE - $status --all >>"EOO"; - prj configured 0.1.0-a.0.$snapshot + $status --all >>~%EOO%; + %prj configured 0\.1\.0-a\.0\..+% EOO $* list >>/"EOO"; -- cgit v1.1