1. Index: security/nss/tests/run_niscc.sh
  2. ===================================================================
  3. RCS file: /cvsroot/mozilla/security/nss/tests/run_niscc.sh,v
  4. retrieving revision 1.7
  5. diff -u -8 -p -r1.7 run_niscc.sh
  6. --- security/nss/tests/run_niscc.sh 13 Jul 2012 20:30:25 -0000 1.7
  7. +++ security/nss/tests/run_niscc.sh 27 Jul 2012 09:23:33 -0000
  8. @@ -567,17 +615,17 @@ ssl_simple_client_auth()
  9. if [ "$SMALLSET" = "true" ]; then
  10. export STOP_AT=10
  11. else
  12. export STOP_AT=106160
  13. fi
  14. unset NISCC_TEST
  15. export LD_LIBRARY_PATH="$TESTLIB"
  16. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  17. - "${TESTTOOLS}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -rr -t $THREADS -w test > "$TEST_OUTPUT/nisccLog01" 2>&1 &
  18. + selfserv_wrapper "${TESTTOOLS}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -rr -t $THREADS -w test > "$TEST_OUTPUT/nisccLog01" 2>&1 &
  20. export NISCC_TEST="$TEST/simple_client"
  21. export LD_LIBRARY_PATH="$HACKLIB"
  23. for START in `seq $START_AT $THREADS $STOP_AT`; do
  24. START_AT=$START \
  25. STOP_AT=$(($START+$THREADS)) \
  26. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  27. @@ -610,17 +658,17 @@ ssl_simple_server_auth()
  28. if [ "$SMALLSET" = "true" ]; then
  29. export STOP_AT=00000010
  30. else
  31. export STOP_AT=00106167
  32. fi
  33. export LD_LIBRARY_PATH="$HACKLIB"
  34. export NISCC_TEST="$TEST/simple_server"
  35. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  36. - "${HACKBIN}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -t $THREADS -w test > "$TEST_OUTPUT/nisccLog03" 2>&1 &
  37. + selfserv_wrapper "${HACKBIN}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -t $THREADS -w test > "$TEST_OUTPUT/nisccLog03" 2>&1 &
  39. unset NISCC_TEST
  40. export LD_LIBRARY_PATH="$TESTLIB"
  41. for START in `seq $START_AT $THREADS $STOP_AT`; do
  42. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  43. "${TESTTOOLS}/strsclnt" $VERBOSE -d "$CLIENT" -p $PORT -t $THREADS -c $THREADS -o -N $HOST >> "$TEST_OUTPUT/nisccLog04" 2>&1
  44. done
  46. @@ -649,17 +697,17 @@ ssl_simple_rootca()
  47. if [ "$SMALLSET" = "true" ]; then
  48. export STOP_AT=10
  49. else
  50. export STOP_AT=106190
  51. fi
  52. export LD_LIBRARY_PATH="$HACKLIB"
  53. export NISCC_TEST="$TEST/simple_rootca"
  54. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  55. - "${HACKBIN}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -t $THREADS -w test > "$TEST_OUTPUT/nisccLog05" 2>&1 &
  56. + selfserv_wrapper "${HACKBIN}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -t $THREADS -w test > "$TEST_OUTPUT/nisccLog05" 2>&1 &
  58. unset NISCC_TEST
  59. export LD_LIBRARY_PATH="$TESTLIB"
  60. for START in `seq $START_AT $THREADS $STOP_AT`; do
  61. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  62. "${TESTTOOLS}/strsclnt" $VERBOSE -d "$CLIENT" -p $PORT -t $THREADS -c $THREADS -o -N $HOST >> "$TEST_OUTPUT/nisccLog06" 2>&1
  63. done
  65. @@ -688,17 +736,17 @@ ssl_resigned_client_auth()
  66. if [ "$SMALLSET" = "true" ]; then
  67. export STOP_AT=9
  68. else
  69. export STOP_AT=99981
  70. fi
  71. unset NISCC_TEST
  72. export LD_LIBRARY_PATH="$TESTLIB"
  73. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  74. - "${TESTTOOLS}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -rr -t $THREADS -w test > "$TEST_OUTPUT/nisccLog07" 2>&1 &
  75. + selfserv_wrapper "${TESTTOOLS}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -rr -t $THREADS -w test > "$TEST_OUTPUT/nisccLog07" 2>&1 &
  77. export NISCC_TEST="$TEST/resigned_client"
  78. export LD_LIBRARY_PATH="$HACKLIB"
  80. for START in `seq $START_AT $THREADS $STOP_AT`; do
  81. START_AT=$START \
  82. STOP_AT=$(($START+$THREADS)) \
  83. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  84. @@ -731,17 +779,17 @@ ssl_resigned_server_auth()
  85. if [ "$SMALLSET" = "true" ]; then
  86. export STOP_AT=9
  87. else
  88. export STOP_AT=100068
  89. fi
  90. export LD_LIBRARY_PATH="$HACKLIB"
  91. export NISCC_TEST="$TEST/resigned_server"
  92. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  93. - "${HACKBIN}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -t $THREADS -w test > "$TEST_OUTPUT/nisccLog09" 2>&1 &
  94. + selfserv_wrapper "${HACKBIN}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -t $THREADS -w test > "$TEST_OUTPUT/nisccLog09" 2>&1 &
  96. unset NISCC_TEST
  97. export LD_LIBRARY_PATH="$TESTLIB"
  98. for START in `seq $START_AT $THREADS $STOP_AT`; do
  99. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  100. "${TESTTOOLS}/strsclnt" $VERBOSE -d "$CLIENT" -p $PORT -t $THREADS -c $THREADS -o -N $HOST >> "$TEST_OUTPUT/nisccLog10" 2>&1
  101. done
  103. @@ -770,17 +818,17 @@ ssl_resigned_rootca()
  104. if [ "$SMALLSET" = "true" ]; then
  105. export STOP_AT=9
  106. else
  107. export STOP_AT=99959
  108. fi
  109. export LD_LIBRARY_PATH="$HACKLIB"
  110. export NISCC_TEST="$TEST/resigned_rootca"
  111. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  112. - "${HACKBIN}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -t $THREADS -w test > "$TEST_OUTPUT/nisccLog11" 2>&1 &
  113. + selfserv_wrapper "${HACKBIN}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -t $THREADS -w test > "$TEST_OUTPUT/nisccLog11" 2>&1 &
  115. unset NISCC_TEST
  116. export LD_LIBRARY_PATH="$TESTLIB"
  117. for START in `seq $START_AT $THREADS $STOP_AT`; do
  118. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  119. "${TESTTOOLS}/strsclnt" $VERBOSE -d "$CLIENT" -p $PORT -t $THREADS -c $THREADS -o -N $HOST >> "$TEST_OUTPUT/nisccLog12" 2>&1
  120. done