Author: mvidner Date: Mon Feb 1 16:47:57 2010 New Revision: 60640 URL: http://svn.opensuse.org/viewcvs/yast?rev=60640&view=rev Log: Re-enabled parts of liby2util-r testsuite (to make ground for a new test case) Modified: branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/ (props changed) branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/Makefile.am branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/lib/liby2util_init.exp branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/liby2util.test/liby2util.exp branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/test_chroot.cc branches/SuSE-Code-11-SP1-Branch/core/package/yast2-core.changes Modified: branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/Makefile.am?rev=60640&r1=60639&r2=60640&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/Makefile.am Mon Feb 1 16:47:57 2010 @@ -15,14 +15,14 @@ -Xlinker --no-whole-archive noinst_PROGRAMS = \ - test_Y2SLog.prg \ - test_strutil.prg \ + test_Y2SLog \ + test_strutil \ test_mkdir.prg \ test_chroot.prg -test_Y2SLog_prg_SOURCES = test_Y2SLog.cc +test_Y2SLog_SOURCES = test_Y2SLog.cc -test_strutil_prg_SOURCES = test_strutil.cc +test_strutil_SOURCES = test_strutil.cc test_mkdir_prg_SOURCES = test_mkdir.cc Modified: branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/lib/liby2util_init.exp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/lib/liby2util_init.exp?rev=60640&r1=60639&r2=60640&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/lib/liby2util_init.exp (original) +++ branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/lib/liby2util_init.exp Mon Feb 1 16:47:57 2010 @@ -40,13 +40,6 @@ return -1 } - # check return code from runprg - - if {$result != ""} { - warning "Run of $base_name results in '$result'" - return -1 - } - # ok, all is fine pass $base_name Modified: branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/liby2util.test/liby2util.exp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/liby2util.test/liby2util.exp?rev=60640&r1=60639&r2=60640&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/liby2util.test/liby2util.exp (original) +++ branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/liby2util.test/liby2util.exp Mon Feb 1 16:47:57 2010 @@ -10,5 +10,5 @@ # foreach file, call prg-run (from testsuite/lib) # Disable tests because *.prg programs aren't correctly set up as tests. -# foreach file $filenames { prg-run $file } -untested "*.prg aren't tested. Fix the testsuite." +#untested "*.prg aren't tested. Fix the testsuite." +foreach file $filenames { prg-run $file } Modified: branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/test_chroot.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/test_chroot.cc?rev=60640&r1=60639&r2=60640&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/test_chroot.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/testsuite/test_chroot.cc Mon Feb 1 16:47:57 2010 @@ -6,15 +6,15 @@ int main(int argc, char* argv[]) { - if(argc<2) + const char * chroot = "/"; + if(argc >= 2) { - cout << "must specify directory to chroot to" << endl; - return 1; + chroot = argv[1]; } - char* aa[] = { "ls" , "-al", NULL }; + const char* aa[] = { "ls" , "-al", NULL }; // string aa = "ls"; ExternalProgram* prog = new ExternalProgram(aa, ExternalProgram::Stderr_To_Stdout, - false, -1, true, argv[1]); + false, -1, true, chroot); if(!prog) return 1; string line; @@ -25,5 +25,5 @@ cout << line; } cout << "program exited with " << prog->close() << endl; - return 0; + return prog->close(); } Modified: branches/SuSE-Code-11-SP1-Branch/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/core/package/yast2-core.changes?rev=60640&r1=60639&r2=60640&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/core/package/yast2-core.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/core/package/yast2-core.changes Mon Feb 1 16:47:57 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Feb 1 16:01:46 CET 2010 - mvidner@suse.cz + +- Re-enabled parts of liby2util-r testsuite. + +------------------------------------------------------------------- Mon Feb 1 15:50:51 CET 2010 - mvidner@suse.cz - Backported from trunk to allow compiling the old code on 11.2: -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org