[Acmcontester-developers] SF.net SVN: acmcontester:[476] ACMServer/trunk/sharp tester/SourceTest 2.0/ Test

[<Or...@us...>]

Revision: 476
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=476&view=rev
Author:   Oracle_
Date:     2009-02-02 12:55:50 +0000 (Mon, 02 Feb 2009)

Log Message:
-----------
Added UserOutput to results.

Modified Paths:
--------------
    ACMServer/trunk/sharp tester/SourceTest 2.0/Test/Test.cpp
    ACMServer/trunk/sharp tester/SourceTest 2.0/Test/Test.h

Modified: ACMServer/trunk/sharp tester/SourceTest 2.0/Test/Test.cpp
===================================================================
--- ACMServer/trunk/sharp tester/SourceTest 2.0/Test/Test.cpp	2009-02-02 01:54:43 UTC (rev 475)
+++ ACMServer/trunk/sharp tester/SourceTest 2.0/Test/Test.cpp	2009-02-02 12:55:50 UTC (rev 476)
@@ -278,9 +278,9 @@
 			result->Details=gcnew String(sec->Details.c_str())+" No output file";
 			return false;
 		}
+		result->UserOutput=ReadAllFile(oupath);
+		Checker^ check=gcnew Tester::Checker(Path::GetFullPath(data->Checker),test->tests[index-1]->input,result->UserOutput,test->tests[index-1]->output);
 
-		Checker^ check=gcnew Tester::Checker(Path::GetFullPath(data->Checker),test->tests[index-1]->input,ReadAllFile(oupath),test->tests[index-1]->output);
-
 		switch (check->Check())
 		{
 		case CheckResult::OE: 

Modified: ACMServer/trunk/sharp tester/SourceTest 2.0/Test/Test.h
===================================================================
--- ACMServer/trunk/sharp tester/SourceTest 2.0/Test/Test.h	2009-02-02 01:54:43 UTC (rev 475)
+++ ACMServer/trunk/sharp tester/SourceTest 2.0/Test/Test.h	2009-02-02 12:55:50 UTC (rev 476)
@@ -36,6 +36,7 @@
 	public ref struct TestRes
 	{
 		String^ Details;
+		String^ UserOutput;
 		TestResult res;
 		int UsedTime;
 		int UsedMemory;
@@ -45,6 +46,7 @@
 		TestRes()
 		{
 			Details="";
+			UserOutput="";
 			UsedTime=-1;
 			UsedMemory=-1;
 			UsedRealTime=-1;
@@ -54,6 +56,7 @@
 		TestRes^ operator=(TestRes^ value)
 		{
 			this->Details=value->Details;
+			this->UserOutput=value->UserOutput;
 			this->Points=value->Points;
 			this->res=value->res;
 			this->UsedMemory=value->UsedMemory;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.