Merge branch 'dev' into multiport_cleanup

This commit is contained in:
Matt Guthaus 2018-07-09 09:58:13 -07:00
commit 5cf62e82cf
2 changed files with 2 additions and 2 deletions

View File

@ -21,7 +21,7 @@ class openram_test(openram_test):
debug.info(1, "Testing top-level openram.py with 2-bit, 16 word SRAM.")
out_file = "testsram"
# make a temp directory for output
out_path = "/tmp/testsram_{0}".format(OPTS.tech_name)
out_path = "/tmp/testsram_{0}_{1}_{2}/".format(OPTS.tech_name,getpass.getuser(),os.getpid())
# make sure we start without the files existing
if os.path.exists(out_path):

View File

@ -27,5 +27,5 @@ modules = map(__import__, moduleNames)
suite = unittest.TestSuite()
load = unittest.defaultTestLoader.loadTestsFromModule
suite.addTests(map(load, modules))
ret = unittest.TextTestRunner(verbosity=2).run(suite).wasSuccessful()
ret = not unittest.TextTestRunner(verbosity=2).run(suite).wasSuccessful()
sys.exit(ret)