diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2010-04-03 16:51:37 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2010-04-03 16:51:37 -0400 |
| commit | 79a258ebcac2aeefbd0b2b074a5eeefa5e301553 (patch) | |
| tree | 1a4e8dc35c992935e7373dadd035bebfd9d33fa1 /devtools | |
| parent | 8cf718505fbfa509da8bb038f258b954627037bc (diff) | |
| download | gpsd-79a258ebcac2aeefbd0b2b074a5eeefa5e301553.tar.gz | |
Cleanup on the flock stuff.
Diffstat (limited to 'devtools')
| -rw-r--r-- | devtools/flock-instructions | 2 | ||||
| -rwxr-xr-x | devtools/flocktest | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/devtools/flock-instructions b/devtools/flock-instructions index 9522332f..cf660672 100644 --- a/devtools/flock-instructions +++ b/devtools/flock-instructions @@ -39,7 +39,7 @@ To use the test network: do "flocktest -?" to see instructions about how to set this up.) The local flocktest script will upload an agent script to each - machine that will do "autogen.sh && mak % make check". flocktest + machine that will do "autogen.sh && make % make check". flocktest will only return after all tests are complete, but they will be run in parallel rather than sequentially. diff --git a/devtools/flocktest b/devtools/flocktest index 286cb758..36d3556f 100755 --- a/devtools/flocktest +++ b/devtools/flocktest @@ -76,7 +76,6 @@ if [ -f "flockdriver.lock" ] then logmessage="A test was already running when you initiated this one." cd $subdir - mailback=no else ( echo "Test begins: "`date` @@ -91,7 +90,8 @@ else git clone $origin $subdir >>"flockdriver-${subdir}.log" 2>&1 cd $subdir else - cd $subdir; git pull >>"../flockdriver-${subdir}.log" 2>&1 + cd $subdir; + git pull >>"../flockdriver-${subdir}.log" 2>&1 fi # Perform the test |