Commit 63498417 authored by Jens Korinth's avatar Jens Korinth
Browse files

Fix bug in DecoupledDataSource, remove crossVersions

parent 9749d045
...@@ -2,11 +2,9 @@ name := "chisel-miscutils" ...@@ -2,11 +2,9 @@ name := "chisel-miscutils"
organization := "esa.cs.tu-darmstadt.de" organization := "esa.cs.tu-darmstadt.de"
version := "0.2-SNAPSHOT" version := "0.3-SNAPSHOT"
scalaVersion := "2.11.7" scalaVersion := "2.11.11"
crossScalaVersions := Seq("2.10.3", "2.10.4", "2.11.0")
resolvers ++= Seq( resolvers ++= Seq(
Resolver.sonatypeRepo("snapshots"), Resolver.sonatypeRepo("snapshots"),
...@@ -21,8 +19,9 @@ libraryDependencies ++= (Seq("chisel3","chisel-iotesters").map { ...@@ -21,8 +19,9 @@ libraryDependencies ++= (Seq("chisel3","chisel-iotesters").map {
dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep)) }) dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep)) })
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "2.2.6" % "test", "org.scalatest" %% "scalatest" % "3.0.4" % "test",
"com.typesafe.play" %% "play-json" % "2.4.8" "org.scalacheck" %% "scalacheck" % "1.13.5" % "test",
"com.typesafe.play" %% "play-json" % "2.6.3"
) )
// no parallel tests // no parallel tests
......
...@@ -20,7 +20,7 @@ class DecoupledDataSource_OutputCheck[T <: UInt](m: DecoupledDataSource[T], data ...@@ -20,7 +20,7 @@ class DecoupledDataSource_OutputCheck[T <: UInt](m: DecoupledDataSource[T], data
if (! m.repeat) if (! m.repeat)
errors = "repeat is false, but index (%d) exceeds size(%d)".format(i, m.size) :: errors errors = "repeat is false, but index (%d) exceeds size(%d)".format(i, m.size) :: errors
} else { } else {
if (peek(m.io.out.bits) != m.data(i)) { if (peek(m.io.out.bits) != data(i)) {
errors = "output #%d: expected %d, found %d".format(i, data(i), peek(m.io.out.bits)) :: errors errors = "output #%d: expected %d, found %d".format(i, data(i), peek(m.io.out.bits)) :: errors
} else { } else {
// wait for random time up to 10 cycles // wait for random time up to 10 cycles
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment