Commit a37fbdd5 authored by Christopher Alfeld's avatar Christopher Alfeld
Browse files

Added post parsing and fixed to use new testbed dir structure.

parent a6e850a1
......@@ -40,14 +40,15 @@ if {$scriptdir == "."} {set scriptdir [pwd]}
set updir [file dirname $scriptdir]
set lockfile "/usr/testbed/locks/tblock"
set ns2ir "$updir/ir/ns2ir/parse.tcl"
set assign "$updir/ir/assign.tcl"
set handle_ip "$updir/ir/handle_ip.tcl"
set ns2ir "$scriptdir/ns2ir/parse.tcl"
set postparse "$scriptdir/ns2ir/postparse.tcl"
set assign "$scriptdir/ir/assign.tcl"
set handle_ip "$scriptdir/ir/handle_ip.tcl"
set avail "$updir/db/avail"
set ptopgen "$updir/db/ptopgen"
set ptopfile "/tmp/testbed[pid].ptop"
set reserve "$updir/db/nalloc"
set libir "$updir/ir/libir.tcl"
set libir "$scriptdir/ir/libir.tcl"
source $libir
namespace import TB_LIBIR::ir
......@@ -89,6 +90,14 @@ if {! [file exists $irFile]} {
exit 1
}
outs "Post Parsing ns input."
if {[catch "exec $postparse $nsFile $irFile >@ $logFp 2>@ $logFp" err]} {
outs stderr "Error post parsing ns input. ($err)"
exit 1
}
exit 1
outs "Locking the world!"
set wait {15 30 60 600 600}
set waiti 0
......
Supports Markdown
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