Skip to content

Commit b27993d

Browse files
kaby76kaby76
authored
Merge branch 'master' into g4-4660
2 parents e45f532 + 1c5a057 commit b27993d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2734
-305
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,189 +3,189 @@
33
"isRoot": true,
44
"tools": {
55
"trcaret": {
6-
"version": "0.23.26",
6+
"version": "0.23.27",
77
"commands": [
88
"trcaret"
99
],
1010
"rollForward": false
1111
},
1212
"trcover": {
13-
"version": "0.23.26",
13+
"version": "0.23.27",
1414
"commands": [
1515
"trcover"
1616
],
1717
"rollForward": false
1818
},
1919
"trgen": {
20-
"version": "0.23.26",
20+
"version": "0.23.27",
2121
"commands": [
2222
"trgen"
2323
],
2424
"rollForward": false
2525
},
2626
"trglob": {
27-
"version": "0.23.26",
27+
"version": "0.23.27",
2828
"commands": [
2929
"trglob"
3030
],
3131
"rollForward": false
3232
},
3333
"triconv": {
34-
"version": "0.23.26",
34+
"version": "0.23.27",
3535
"commands": [
3636
"triconv"
3737
],
3838
"rollForward": false
3939
},
4040
"trparse": {
41-
"version": "0.23.26",
41+
"version": "0.23.27",
4242
"commands": [
4343
"trparse"
4444
],
4545
"rollForward": false
4646
},
4747
"trquery": {
48-
"version": "0.23.26",
48+
"version": "0.23.27",
4949
"commands": [
5050
"trquery"
5151
],
5252
"rollForward": false
5353
},
5454
"trtext": {
55-
"version": "0.23.26",
55+
"version": "0.23.27",
5656
"commands": [
5757
"trtext"
5858
],
5959
"rollForward": false
6060
},
6161
"trwdog": {
62-
"version": "0.23.26",
62+
"version": "0.23.27",
6363
"commands": [
6464
"trwdog"
6565
],
6666
"rollForward": false
6767
},
6868
"trxgrep": {
69-
"version": "0.23.26",
69+
"version": "0.23.27",
7070
"commands": [
7171
"trxgrep"
7272
],
7373
"rollForward": false
7474
},
7575
"trxml": {
76-
"version": "0.23.26",
76+
"version": "0.23.27",
7777
"commands": [
7878
"trxml"
7979
],
8080
"rollForward": false
8181
},
8282
"trxml2": {
83-
"version": "0.23.26",
83+
"version": "0.23.27",
8484
"commands": [
8585
"trxml2"
8686
],
8787
"rollForward": false
8888
},
8989
"trclonereplace": {
90-
"version": "0.23.26",
90+
"version": "0.23.27",
9191
"commands": [
9292
"trclonereplace"
9393
],
9494
"rollForward": false
9595
},
9696
"trcombine": {
97-
"version": "0.23.26",
97+
"version": "0.23.27",
9898
"commands": [
9999
"trcombine"
100100
],
101101
"rollForward": false
102102
},
103103
"trconvert": {
104-
"version": "0.23.26",
104+
"version": "0.23.27",
105105
"commands": [
106106
"trconvert"
107107
],
108108
"rollForward": false
109109
},
110110
"trfoldlit": {
111-
"version": "0.23.26",
111+
"version": "0.23.27",
112112
"commands": [
113113
"trfoldlit"
114114
],
115115
"rollForward": false
116116
},
117117
"tritext": {
118-
"version": "0.23.26",
118+
"version": "0.23.27",
119119
"commands": [
120120
"tritext"
121121
],
122122
"rollForward": false
123123
},
124124
"trjson": {
125-
"version": "0.23.26",
125+
"version": "0.23.27",
126126
"commands": [
127127
"trjson"
128128
],
129129
"rollForward": false
130130
},
131131
"trperf": {
132-
"version": "0.23.26",
132+
"version": "0.23.27",
133133
"commands": [
134134
"trperf"
135135
],
136136
"rollForward": false
137137
},
138138
"trrename": {
139-
"version": "0.23.26",
139+
"version": "0.23.27",
140140
"commands": [
141141
"trrename"
142142
],
143143
"rollForward": false
144144
},
145145
"trsort": {
146-
"version": "0.23.26",
146+
"version": "0.23.27",
147147
"commands": [
148148
"trsort"
149149
],
150150
"rollForward": false
151151
},
152152
"trsplit": {
153-
"version": "0.23.26",
153+
"version": "0.23.27",
154154
"commands": [
155155
"trsplit"
156156
],
157157
"rollForward": false
158158
},
159159
"trsponge": {
160-
"version": "0.23.26",
160+
"version": "0.23.27",
161161
"commands": [
162162
"trsponge"
163163
],
164164
"rollForward": false
165165
},
166166
"trtokens": {
167-
"version": "0.23.26",
167+
"version": "0.23.27",
168168
"commands": [
169169
"trtokens"
170170
],
171171
"rollForward": false
172172
},
173173
"trtree": {
174-
"version": "0.23.26",
174+
"version": "0.23.27",
175175
"commands": [
176176
"trtree"
177177
],
178178
"rollForward": false
179179
},
180180
"trunfold": {
181-
"version": "0.23.26",
181+
"version": "0.23.27",
182182
"commands": [
183183
"trunfold"
184184
],
185185
"rollForward": false
186186
},
187187
"trunfoldlit": {
188-
"version": "0.23.26",
188+
"version": "0.23.27",
189189
"commands": [
190190
"trunfoldlit"
191191
],

‎.github/workflows/main.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ jobs:
150150
git checkout 4975d4a7b556e34c38c2e53b9815c8c4c802236f
151151
npm i
152152
npm run build
153+
- name: Test Rust
154+
run: rustup --version
153155
- name: Test
154156
shell: pwsh
155157
run: |
@@ -227,6 +229,8 @@ jobs:
227229
shell: bash
228230
run: |
229231
dotnet trgen --help
232+
- name: Test Rust
233+
run: rustup --version
230234
- name: Test
231235
shell: bash
232236
run: |

‎_scripts/templates/Antlr4cs/st.perf.sh‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ files=()
6161
for f in $files2
6262
do
6363
if [ -d "$f" ]; then continue; fi
64-
dotnet triconv -f utf-8 $f > /dev/null 2>&1
65-
if [ "$?" = "0" ]
66-
then
67-
files+=( $f )
68-
fi
64+
files+=( $f )
6965
done
7066

7167
# People often specify a test file directory, but sometimes no
@@ -105,6 +101,8 @@ fi
105101
# Loop from 1 to n and execute the body of the loop each time
106102
if [[ "$type" == "group" ]]
107103
then
104+
# Run once and to work past virus scan delay.
105+
echo "${files[1]}" | dotnet trwdog ./bin/Debug/net8.0/<if(os_win)>Test.exe<else>Test<endif> -x -prefix group > /dev/null 2>&1
108106
for ((i=1; i\<=n; i++))
109107
do
110108
echo "${files[*]}" | dotnet trwdog ./bin/Debug/net8.0/<if(os_win)>Test.exe<else>Test<endif> -x -prefix group >> parse.txt 2>&1

‎_scripts/templates/Antlr4ng/st.perf.sh‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ files=()
6161
for f in $files2
6262
do
6363
if [ -d "$f" ]; then continue; fi
64-
dotnet triconv -f utf-8 $f > /dev/null 2>&1
65-
if [ "$?" = "0" ]
66-
then
67-
files+=( $f )
68-
fi
64+
files+=( $f )
6965
done
7066

7167
# People often specify a test file directory, but sometimes no
@@ -105,6 +101,7 @@ fi
105101
# Loop from 1 to n and execute the body of the loop each time
106102
if [[ "$type" == "group" ]]
107103
then
104+
echo "${files[1]}" | dotnet trwdog sh -c "exec npx tsx Test.js -x -prefix group" > /dev/null 2>&1
108105
for ((i=1; i\<=n; i++))
109106
do
110107
echo "${files[*]}" | dotnet trwdog sh -c "exec npx tsx Test.js -x -prefix group" >> parse.txt 2>&1

‎_scripts/templates/CSharp/st.perf.sh‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ files=()
6161
for f in $files2
6262
do
6363
if [ -d "$f" ]; then continue; fi
64-
dotnet triconv -f utf-8 $f > /dev/null 2>&1
65-
if [ "$?" = "0" ]
66-
then
67-
files+=( $f )
68-
fi
64+
files+=( $f )
6965
done
7066

7167
# People often specify a test file directory, but sometimes no
@@ -114,6 +110,7 @@ fi
114110
# Loop from 1 to n and execute the body of the loop each time
115111
if [[ "$type" == "group" ]]
116112
then
113+
echo "${files[1]}" | dotnet trwdog ./bin/Debug/net8.0/<if(os_win)>Test.exe<else>Test<endif> -x -prefix group > /dev/null 2>&1
117114
for ((i=1; i\<=n; i++))
118115
do
119116
echo "${files[*]}" | dotnet trwdog ./bin/Debug/net8.0/<if(os_win)>Test.exe<else>Test<endif> -x -prefix group >> parse.txt 2>&1

‎_scripts/templates/Cpp/st.perf.sh‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ files=()
6161
for f in $files2
6262
do
6363
if [ -d "$f" ]; then continue; fi
64-
dotnet triconv -f utf-8 $f > /dev/null 2>&1
65-
if [ "$?" = "0" ]
66-
then
67-
files+=( $f )
68-
fi
64+
files+=( $f )
6965
done
7066

7167
# People often specify a test file directory, but sometimes no
@@ -105,6 +101,7 @@ fi
105101
# Loop from 1 to n and execute the body of the loop each time
106102
if [[ "$type" == "group" ]]
107103
then
104+
echo "${files[1]}" | dotnet trwdog ./build/<if(os_win)>Release/<endif><exec_name> -x -prefix group > /dev/null 2>&1
108105
for ((i=1; i\<=n; i++))
109106
do
110107
echo "${files[*]}" | dotnet trwdog ./build/<if(os_win)>Release/<endif><exec_name> -x -prefix group >> parse.txt 2>&1

‎_scripts/templates/Dart/st.perf.sh‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ files=()
6161
for f in $files2
6262
do
6363
if [ -d "$f" ]; then continue; fi
64-
dotnet triconv -f utf-8 $f > /dev/null 2>&1
65-
if [ "$?" = "0" ]
66-
then
67-
files+=( $f )
68-
fi
64+
files+=( $f )
6965
done
7066

7167
# People often specify a test file directory, but sometimes no
@@ -105,6 +101,7 @@ fi
105101
# Loop from 1 to n and execute the body of the loop each time
106102
if [[ "$type" == "group" ]]
107103
then
104+
echo "${files[1]}" | dotnet trwdog ./Test.exe -x -prefix group > /dev/null 2>&1
108105
for ((i=1; i\<=n; i++))
109106
do
110107
echo "${files[*]}" | dotnet trwdog ./Test.exe -x -prefix group >> parse.txt 2>&1

‎_scripts/templates/Go/st.perf.sh‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ files=()
6161
for f in $files2
6262
do
6363
if [ -d "$f" ]; then continue; fi
64-
dotnet triconv -f utf-8 $f > /dev/null 2>&1
65-
if [ "$?" = "0" ]
66-
then
67-
files+=( $f )
68-
fi
64+
files+=( $f )
6965
done
7066

7167
# People often specify a test file directory, but sometimes no
@@ -105,6 +101,7 @@ fi
105101
# Loop from 1 to n and execute the body of the loop each time
106102
if [[ "$type" == "group" ]]
107103
then
104+
echo "${files[1]}" | dotnet trwdog ./<if(os_win)>Test.exe<else>Test<endif> -x -prefix group > /dev/null 2>&1
108105
for ((i=1; i\<=n; i++))
109106
do
110107
echo "${files[*]}" | dotnet trwdog ./<if(os_win)>Test.exe<else>Test<endif> -x -prefix group >> parse.txt 2>&1

‎_scripts/templates/Java/st.perf.sh‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ files=()
6161
for f in $files2
6262
do
6363
if [ -d "$f" ]; then continue; fi
64-
dotnet triconv -f utf-8 $f > /dev/null 2>&1
65-
if [ "$?" = "0" ]
66-
then
67-
files+=( $f )
68-
fi
64+
files+=( $f )
6965
done
7066

7167
# People often specify a test file directory, but sometimes no
@@ -108,6 +104,7 @@ fi
108104
# Loop from 1 to n and execute the body of the loop each time
109105
if [[ "$type" == "group" ]]
110106
then
107+
echo "${files[1]}" | dotnet trwdog java -classpath "$CLASSPATH" Test -x -prefix group > /dev/null 2>&1
111108
for ((i=1; i\<=n; i++))
112109
do
113110
echo "${files[*]}" | dotnet trwdog java -classpath "$CLASSPATH" Test -x -prefix group >> parse.txt 2>&1

0 commit comments

Comments
 (0)