Additional fixes

1. Add Makefile, override .gitignore for junit tests (for now)
2. Fix independent bug of segfault when invoking -display_settings

Author: pervazea

script/testing/junit/.gitignore

@@ -0,0 +1,2 @@
+
+!Makefile

script/testing/junit/Makefile

@@ -0,0 +1,36 @@
+
+
+
+.SUFFIXES: .java .class
+
+CP = .:lib/junit-4.12.jar:lib/hamcrest-core-1.3.jar:lib/postgresql-9.4.1209.jre6.jar
+JC = javac
+JFLAGS = -g
+JUNIT = org.junit.runner.JUnitCore
+RM = rm
+
+.java.class:
+	$(JC) $(JFLAGS) -cp $(CP) $*.java
+
+CLASSES = \
+	PLTestBase.java \
+	InsertTPCCTest.java \
+	InsertPSTest.java \
+	UpdateTest.java
+
+default: classes
+
+classes: $(CLASSES:.java=.class)
+
+clean:
+	$(RM) *.class
+
+test:	$(CLASSES)
+	java -jar lib/junit-platform-console-standalone-1.1.0.jar \
+	  --class-path $(CP) \
+          -c InsertPSTest
+#         -c UpdateTest
+#	  -c InsertPSTest -c InsertTPCCTest
+
+
+

src/settings/settings_manager.cpp

@@ -114,7 +114,7 @@ const std::string SettingsManager::GetInfo() const {
   info.append(
       StringUtil::Format("%28s:   %-28s\n", "Code-generation",
                          GetBool(SettingId::codegen) ? "enabled" : "disabled"));
-  info.append(StringUtil::Format("%28s:   %-28s\n", "Optimization Timeout",
+  info.append(StringUtil::Format("%28s:   %-28i\n", "Optimization Timeout",
                                  GetInt(SettingId::task_execution_timeout)));
   return StringBoxUtil::Box(info);
 }