Merge pull request #58 from ucb-bar/more-travis-fixing
More travis fixing
This commit is contained in:
		
							
								
								
									
										11
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								.travis.yml
									
									
									
									
									
								
							@@ -6,6 +6,17 @@ cache:
 | 
				
			|||||||
  directories:
 | 
					  directories:
 | 
				
			||||||
    $HOME/.ivy2
 | 
					    $HOME/.ivy2
 | 
				
			||||||
    regression/install
 | 
					    regression/install
 | 
				
			||||||
 | 
					    chisel/target
 | 
				
			||||||
 | 
					    context-dependent-environments/target
 | 
				
			||||||
 | 
					    groundtest/target
 | 
				
			||||||
 | 
					    hardfloat/target
 | 
				
			||||||
 | 
					    junctions/target
 | 
				
			||||||
 | 
					    project/project/target
 | 
				
			||||||
 | 
					    project/target
 | 
				
			||||||
 | 
					    rocket/target
 | 
				
			||||||
 | 
					    target
 | 
				
			||||||
 | 
					    uncore/target
 | 
				
			||||||
 | 
					    zscale/target
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# packages needed to build riscv-tools
 | 
					# packages needed to build riscv-tools
 | 
				
			||||||
addons:
 | 
					addons:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -76,6 +76,7 @@ stamps/other-submodules.stamp:
 | 
				
			|||||||
	git -C $(abspath $(TOP)) submodule update --init --recursive rocket
 | 
						git -C $(abspath $(TOP)) submodule update --init --recursive rocket
 | 
				
			||||||
	git -C $(abspath $(TOP)) submodule update --init --recursive torture
 | 
						git -C $(abspath $(TOP)) submodule update --init --recursive torture
 | 
				
			||||||
	git -C $(abspath $(TOP)) submodule update --init --recursive uncore
 | 
						git -C $(abspath $(TOP)) submodule update --init --recursive uncore
 | 
				
			||||||
 | 
						git -C $(abspath $(TOP)) submodule update --init --recursive zscale
 | 
				
			||||||
	date > $@
 | 
						date > $@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
$(RISCV)/install.stamp:
 | 
					$(RISCV)/install.stamp:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -49,7 +49,7 @@ run-$makeTargetName-debug: $$(addprefix $$(output_dir)/, $$(addsuffix .vpd, $$($
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class AssemblyTestSuite(makePrefix: String, toolsPrefix: String, val names: LinkedHashSet[String])(envName: String) extends RocketTestSuite {
 | 
					class AssemblyTestSuite(makePrefix: String, toolsPrefix: String, val names: LinkedHashSet[String])(envName: String) extends RocketTestSuite {
 | 
				
			||||||
  val dir = "$(base_dir)/riscv-tools/riscv-tests/isa"
 | 
					  val dir = "$(RISCV)/riscv64-unknown-elf/share/riscv-tests/isa"
 | 
				
			||||||
  val makeTargetName = makePrefix + "-" + envName + "-asm-tests"
 | 
					  val makeTargetName = makePrefix + "-" + envName + "-asm-tests"
 | 
				
			||||||
  override def toString = s"$makeTargetName = \\\n" + names.map(n => s"\t$toolsPrefix-$envName-$n").mkString(" \\\n") + postScript
 | 
					  override def toString = s"$makeTargetName = \\\n" + names.map(n => s"\t$toolsPrefix-$envName-$n").mkString(" \\\n") + postScript
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user