View | Details | Raw Unified | Return to bug 715
Collapse All | Expand All

(-)a/test.py (-2 / +12 lines)
 Lines 151-157    Link Here 
151
#
151
#
152
# Most of the examples produce gangs of trace files, so we want to find
152
# Most of the examples produce gangs of trace files, so we want to find
153
# somewhere to put them that won't pollute the current directory.  One
153
# somewhere to put them that won't pollute the current directory.  One
154
# obvious place is somewhere in /tmp.
154
# obvious place is somewhere in /tmp.  Another one is somewhere in 
155
# NS3_BUILDDIR.  So define a sane default here in hope we get to know
156
# NS3_BUILDDIR later.
155
#
157
#
156
TMP_TRACES_DIR = "/tmp/unchecked-traces"
158
TMP_TRACES_DIR = "/tmp/unchecked-traces"
157
159
 Lines 162-168    Link Here 
162
# file that could unintentionally start serializing execution, we ask
164
# file that could unintentionally start serializing execution, we ask
163
# the tests to write their output to a temporary directory and then 
165
# the tests to write their output to a temporary directory and then 
164
# put together the final output file when we "join" the test tasks back
166
# put together the final output file when we "join" the test tasks back
165
# to the main thread.
167
# to the main thread.  Define default location here, but change it later,
168
# when NS3_BUILDDIR is known.
166
#
169
#
167
TMP_OUTPUT_DIR = "/tmp/testpy"
170
TMP_OUTPUT_DIR = "/tmp/testpy"
168
171
 Lines 781-786    Link Here 
781
    make_library_path()
784
    make_library_path()
782
785
783
    #
786
    #
787
    # We got to know NS3_BUILDDIR, so put our temporary stuff there,
788
    # overriding default /tmp location
789
    #
790
    TMP_TRACES_DIR = NS3_BUILDDIR + "/" + NS3_ACTIVE_VARIANT + "/tmp/unchecked-traces"
791
    TMP_OUTPUT_DIR = NS3_BUILDDIR + "/" + NS3_ACTIVE_VARIANT + "/tmp/testpy"
792
793
    #
784
    # There are a couple of options that imply we can to exit before starting
794
    # There are a couple of options that imply we can to exit before starting
785
    # up a bunch of threads and running tests.  Let's detect these cases and 
795
    # up a bunch of threads and running tests.  Let's detect these cases and 
786
    # handle them without doing all of the hard work.
796
    # handle them without doing all of the hard work.

Return to bug 715