monad update patch for mp6 provided tests

git-svn-id: https://subversion.cs.illinois.edu/svn/cs225@5300 6fbd10e7-183d-0410-a318-cb416676e4f2

.monadid

 monad identification file
 This file is used for monad directory identification
 Built by toole1 on linux3.ews.illinois.edu
-Build Date: Thu Nov 10 23:21:04 CST 2011
+Build Date: Mon Nov 14 23:49:24 CST 2011

monad.cpp

@@ -121,16 +121,17 @@ int main(int argc, const char * const * argv)
 	for (size_t i = 0; i < processing_commands.size(); i++)
 		exec_command(processing_commands[i]);
 
-	string makestr = "/usr/bin/make --quiet --warn-undefined-variables -Wfatal-errors";
+	string makestr = "/usr/bin/make --warn-undefined-variables -Wfatal-errors";
 	if (opts::parallel)
 		makestr += " --jobs=4";
+	if (!opts::verbose)
+		makestr += " --quiet";
 	if (opts::optimize)
 		makestr += " OPTIMIZE=on";
 	if (!config["Make Options"].empty())
 		makestr += " " + config["Make Options"][0];
-#if DEBUG
-	cout << makestr <<endl;
-#endif
+	if (opts::verbose)
+		cout << makestr <<endl;
 
 	// Compile with make
 	system(makestr.c_str()); // yes, system is insecure if the user has control
@@ -353,7 +354,7 @@ void monad::importFiles(const string & preservedFolder, const string & theSource
 			assertExists(sourceFile, student_error_code);
 
 			// Remove hacky call to exec here...
-			EXIT_IF_ERROR(exec("cp", "-r", sourceFile.c_str(), destFile.c_str()) != 0,
+			EXIT_IF_ERROR(exec("cp", "-RL", sourceFile.c_str(), destFile.c_str()) != 0,
 				"cp " + sourceFile + " " + destFile + " failed");
 		}
 		else continue;

monad_shared.cpp

@@ -15,7 +15,7 @@ namespace versioninfo
 {
 const char * official_name = "Monad Autograder";
 const char * version_name  = "confession";
-const Version version_num  = Version(2, 1, 1, 0);
+const Version version_num  = Version(2, 1, 1, 1);
 const char * date          = "10 Nov 2011";
 }
 

proxy.h

@@ -249,8 +249,11 @@ using std::endl;
 
 #define PASS            return;
 
-#define ASSERT(expr)    if (!(expr))  \
-                            FAIL("Assertion (" #expr ") failed")
+#define ASSERT(expr)                               \
+	do {                                           \
+		if (!(expr))                               \
+			FAIL("Assertion (" #expr ") failed");  \
+	} while (0)
 
 namespace proxy {
 template <typename T>

quotes.txt

-"It's OK to quit a job with people you like because there are a lot of people to like out there." ~ Michael Lopp
 "That's legit as shit." ~ Rick Barber
 "The cheating sheet is key to success in CS 412 course." ~ CS 412 TA
 "Your job is not just what you're doing; it should be preparing you for what you want to do." ~ Michael Lopp
-"A reputation is a community-based opinion that you don't control. It takes years of work to develop and a single missed key responsibility to destroy." ~ Michael Lopp
 "One day I will shoot you with this bullet. Can you still say that you love me?" ~ Re-l Mayer
 "I didn't say I wanted to die in a blender! I said I wanted to be in a blender!" ~ Kyle Johnson
 "It is practically impossible to teach good programming to students that have had a prior exposure to BASIC: as potential programmers they are mentally mutilated beyond hope of regeneration." ~ Edsger Dijkstra
@@ -10,7 +8,6 @@
 "The primary purpose of the DATA statement is to give names to constants; instead of referring to pi as 3.141592653589793 at every appearance, the variable PI can be given that value with a DATA statement and used instead of the longer form of the constant. This also simplifies modifying the program, should the value of pi change." ~ FORTRAN manual for Xerox computers
 "Any sufficiently advanced bug is indistinguishable from a feature." ~ Rich Kulawiec
 "Worry loudly now or scream louder later." ~ Michael Lopp
-"I can always tell when I don't want to do something because... I never do it." ~ Michael Lopp
 "If you think you can do it all, you're thinking too small." ~ Michael Lopp
 "When you say 'You suck', I think 'I win'." ~ Michael Lopp
 "Honestly, if you don't fit in, then you're probably doing the right thing." ~ LIGHTS