Browse files

Upgrading to specs 1.5, but not yet sure it is reliable.

  • Loading branch information...
1 parent 944c8ba commit fe5c466686e07be435278dcce6dc09a7a9ab6837 @ObjectMentor ObjectMentor committed May 21, 2009
View
2 Makefile
@@ -1,5 +1,5 @@
-CLASSPATH=lib/specs-1.4.1.jar:lib/junit-4.4.jar
+CLASSPATH=lib/specs-1.5.0.jar:lib/junit-4.5.jar
all: clean compile test jar
View
8 bin/sake
@@ -18,7 +18,13 @@ if [ "$SAKE_HOME" = "" ] ; then
fi
for lib in ${SAKE_HOME}/lib/*.jar
do
- CLASSPATH=$lib:$CLASSPATH
+ case "$lib" in
+ *src.jar)
+ ;; # do nothing
+ *)
+ CLASSPATH=$lib:$CLASSPATH
+ ;;
+ esac
done
cygwin=false;
View
BIN lib/junit-4.4.jar
Binary file not shown.
View
BIN lib/junit-4.5.jar
Binary file not shown.
View
BIN lib/sake.jar
Binary file not shown.
View
BIN lib/specs-1.4.3.jar
Binary file not shown.
View
BIN lib/specs-1.5.0.jar
Binary file not shown.
View
8 sake.scala
@@ -17,7 +17,7 @@ showStackTracesOnFailures = false
log.threshold = Level.Info
// Add to the classpath using list semantics.
-environment.classpath :::= files(libDir + "*.jar")
+environment.classpath :::= (files(libDir + "*.jar") -- files(libDir + "*src.jar"))
environment.classpath ::= buildDir
target('all -> List('clean, 'compile, 'spec, 'jars))
@@ -36,8 +36,8 @@ target('srcjar) {
target('spec) {
specs(
'classpath -> environment.classpath,
- 'path -> "spec",
- 'pattern -> ".*Spec.*"
+ 'path -> "./spec/**/*.scala",
+ 'pattern -> ".*"
)
}
@@ -46,7 +46,7 @@ target('compile -> List('clean, 'build_dir)) {
'files -> files(srcDir+"**/*.scala", specDir+"**/*.scala"),
'classpath -> environment.classpath,
'd -> buildDir,
- 'opts -> ("-unchecked -deprecation -Xplugin:" + sxr +" -P:sxr:base-directory:.")
+ 'opts -> ("-unchecked -deprecation") // -Xplugin:" + sxr +" -P:sxr:base-directory:.")
)
}
View
4 spec/sake/command/builtin/SpecCommandSpec.scala
@@ -43,8 +43,8 @@ object SpecCommandSpec extends Specification {
}
}
- "Invoking a failing specs" should {
- "exit" in {
+ "Invoking a failing spec" should {
+ "throw a build error" in {
new SpecCommand() (
'classpath -> environment.classpath,
'path -> "spec/**/FailingSpek.scala",
View
4 src/sake/command/builtin/SpecCommand.scala
@@ -54,11 +54,11 @@ import org.specs.runner._
* Simple command line tool to run the specs in the given file/directory specification (1st argument)
* matching the given pattern (2nd argument).
* When running this object separately, use the command,
- * scala -classpath lib/specs-1.4.3.jar:lib/junit-4.4.jar:build sake.command.builtin.SakeSpecRunner [path [pattern]]
+ * scala -classpath lib/specs-1.4.3.jar:build sake.command.builtin.SakeSpecRunner [path [pattern]]
*/
object SakeSpecRunner {
val defaultPath = "spec"
- val defaultPattern = ".*"
+ val defaultPattern = ".*Spec.*"
def main(args: Array[String]) = {
val path = if (args.length >= 1) args(0) else defaultPath

0 comments on commit fe5c466

Please sign in to comment.