Skip to content

Commit af7c4f3

Browse files
Version 1.4.3.
1 parent b4b4ca7 commit af7c4f3

File tree

6 files changed

+24
-23
lines changed

6 files changed

+24
-23
lines changed

test/gen_tests.bat

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ rem ----------------------------------------------------------------------------
2626
SETLOCAL enableDelayedExpansion
2727
ECHO !time! Start Test Data Generation
2828

29+
IF EXIST _build\test\lib\ocparse\test\generated (
30+
RD /Q /S _build\test\lib\ocparse\test\generated
31+
)
2932
IF EXIST _build\test\lib\ocparse\test\performance_*.* (
3033
DEL /Q _build\test\lib\ocparse\test\performance_*.*
3134
)
3235
IF EXIST _build\test\lib\ocparse\test\reliability_*.* (
3336
DEL /Q _build\test\lib\ocparse\test\reliability_*.*
3437
)
35-
IF EXIST test\performance_*.* (
36-
DEL /Q test\performance_*.*
37-
)
38-
IF EXIST test\reliability_*.* (
39-
DEL /Q test\reliability_*.*
38+
IF EXIST test\generated (
39+
RD /Q /S test\generated
4040
)
4141

4242
CALL rebar3 as test compile
@@ -49,7 +49,7 @@ rem ----------------------------------------------------------------------------
4949
SET GENERATE_EUNIT=false
5050
SET GENERATE_PERFORMANCE=true
5151
SET GENERATE_RELIABILITY=true
52-
SET HEAP_SIZE=+hms 100663296
52+
SET HEAP_SIZE=+hms 33554432
5353
SET LOGGING=false
5454
SET MAX_BASIC_RULE=100
5555
)

test/gen_tests.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ timestamp() {
3131

3232
echo "$(timestamp) Start Test Data Generation"
3333

34+
if [ -d "_build/test/lib/ocparse/test/generated" ]; then
35+
rm -rf _build/test/lib/ocparse/test/generated
36+
fi
3437
if ls _build/test/lib/ocparse/test/performance_*.* 1> /dev/null 2>&1; then
3538
rm _build/test/lib/ocparse/test/performance_*.*
3639
fi
3740
if ls _build/test/lib/ocparse/test/reliability_*.* 1> /dev/null 2>&1; then
3841
rm _build/test/lib/ocparse/test/reliability_*.*
3942
fi
40-
if ls test/performance_*.* 1> /dev/null 2>&1; then
41-
rm test/performance_*.*
42-
fi
43-
if ls test/reliability_*.* 1> /dev/null 2>&1; then
44-
rm test/reliability_*.*
43+
if [ -d "test/generated" ]; then
44+
rm -rf test/generated
4545
fi
4646

4747
rebar3 as test compile
@@ -54,7 +54,7 @@ if [ "$GENERATE_COMPACTED" == "" ]; then
5454
export GENERATE_EUNIT="false"
5555
export GENERATE_PERFORMANCE="true"
5656
export GENERATE_RELIABILITY="true"
57-
export HEAP_SIZE="+hms 100663296"
57+
export HEAP_SIZE="+hms 33554432"
5858
export LOGGING="false"
5959
export MAX_BASIC_RULE=100
6060
fi

test/gen_tests_and_run.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ rem ----------------------------------------------------------------------------
3333
SET GENERATE_EUNIT=false
3434
SET GENERATE_PERFORMANCE=true
3535
SET GENERATE_RELIABILITY=true
36-
SET HEAP_SIZE=+hms 100663296
36+
SET HEAP_SIZE=+hms 33554432
3737
SET LOGGING=false
3838
SET MAX_BASIC_RULE=100
3939
CALL test\gen_tests

test/gen_tests_and_run.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ export GENERATE_CT="true"
3838
export GENERATE_EUNIT="false"
3939
export GENERATE_PERFORMANCE="true"
4040
export GENERATE_RELIABILITY="true"
41-
export HEAP_SIZE="+hms 100663296"
41+
export HEAP_SIZE="+hms 33554432"
4242
export LOGGING="false"
4343
export MAX_BASIC_RULE=100
44-
gen_tests.sh
44+
test/gen_tests.sh
4545

4646
echo "$(timestamp) Start EUnit Tests"
4747
SOURCEFILES_OLD=SOURCEFILES

test/stress_test.bat

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,10 @@ IF "%1" == "" (
3434
ECHO !time! Start run - in total %NO_RUNS%
3535

3636
IF EXIST _build\test\logs (
37-
ECHO "Deleting _build\test\logs"
3837
RD /Q /S _build\test\logs
3938
)
4039
MD _build\test\logs
4140
IF EXIST tmp\backup (
42-
ECHO "Deleting tmp\backup"
4341
RD /Q /S tmp\backup
4442
)
4543
MD tmp\backup
@@ -51,7 +49,7 @@ IF "%1" == "" (
5149
SET GENERATE_EUNIT=false
5250
SET GENERATE_PERFORMANCE=true
5351
SET GENERATE_RELIABILITY=false
54-
SET HEAP_SIZE=+hms 100663296
52+
SET HEAP_SIZE=+hms 33554432
5553
SET LOGGING=false
5654
SET MAX_BASIC_RULE=10
5755

@@ -61,7 +59,12 @@ IF "%1" == "" (
6159
CALL test\gen_tests.bat
6260

6361
MD tmp\backup\%%G
64-
COPY test\*_SUITE.erl tmp\backup\%%G
62+
IF EXIST test\generated\ct (
63+
COPY test\generated\ct\*_SUITE.erl tmp\backup\%%G
64+
)
65+
IF EXIST test\generated\eunit (
66+
COPY test\generated\eunit\*_SUITE.erl tmp\backup\%%G
67+
)
6568

6669
ECHO !time! %%G. Step: rebar3 ct
6770
CALL rebar3 ct

test/stress_test.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,10 @@ echo "======================================================================="
4040
echo "$(timestamp) Start run - in total $NO_RUNS"
4141

4242
if [ -d "_build/test/logs" ]; then
43-
echo "Deleting _build/test/logs"
4443
rm -rf _build/test/logs
4544
fi
4645
mkdir _build/test/logs
4746
if [ -d "tmp/backup" ]; then
48-
echo "Deleting tmp/backup"
4947
rm -rf tmp/backup
5048
fi
5149
mkdir tmp/backup
@@ -57,7 +55,7 @@ export GENERATE_CT="true"
5755
export GENERATE_EUNIT="false"
5856
export GENERATE_PERFORMANCE="true"
5957
export GENERATE_RELIABILITY="false"
60-
export HEAP_SIZE="+hms 100663296"
58+
export HEAP_SIZE="+hms 33554432"
6159
export LOGGING="false"
6260
export MAX_BASIC_RULE=100
6361

@@ -68,7 +66,7 @@ do
6866
test/gen_tests.sh
6967

7068
mkdir tmp/backup/$i
71-
cp test/*_SUITE.erl tmp/backup/$i
69+
cp test/generated/*/*_SUITE.erl tmp/backup/$i
7270

7371
echo "$(timestamp) $i. Step: rebar3 ct"
7472
rebar3 ct

0 commit comments

Comments
 (0)