File tree Expand file tree Collapse file tree 2 files changed +25
-3
lines changed Expand file tree Collapse file tree 2 files changed +25
-3
lines changed Original file line number Diff line number Diff line change @@ -112,9 +112,9 @@ jobs:
112112              -DGGML_OPENMP=OFF ; 
113113          cmake --build build --config ${{ matrix.build_type }} -j $(nproc) --target llama-server 
114114
115-        - name : Build 
116-         id : cmake_build 
117-         if : ${{ matrix.sanitizer != 'THREAD' }} 
115+        - name : Build (sanitizers)  
116+         id : cmake_build_sanitizers 
117+         if : ${{ matrix.sanitizer != '' && matrix.sanitizer != ' THREAD' }} 
118118        run : | 
119119          cmake -B build \ 
120120              -DGGML_NATIVE=OFF \ 
@@ -124,12 +124,31 @@ jobs:
124124              -DLLAMA_SANITIZE_${{ matrix.sanitizer }}=ON ; 
125125          cmake --build build --config ${{ matrix.build_type }} -j $(nproc) --target llama-server 
126126
127+        - name : Build (sanitizers) 
128+         id : cmake_build 
129+         if : ${{ matrix.sanitizer == '' }} 
130+         run : | 
131+           cmake -B build \ 
132+               -DGGML_NATIVE=OFF \ 
133+               -DLLAMA_BUILD_SERVER=ON \ 
134+               -DLLAMA_CURL=ON \ 
135+               -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ; 
136+           cmake --build build --config ${{ matrix.build_type }} -j $(nproc) --target llama-server 
137+ 
127138       - name : Tests 
128139        id : server_integration_tests 
140+         if : ${{ matrix.sanitizer == '' }} 
129141        run : | 
130142          cd examples/server/tests 
131143          ./tests.sh 
132144
145+        - name : Tests (sanitizers) 
146+         id : server_integration_tests_sanitizers 
147+         if : ${{ matrix.sanitizer != '' }} 
148+         run : | 
149+           cd examples/server/tests 
150+           LLAMA_SANITIZE=1 ./tests.sh 
151+ 
133152       - name : Slow tests 
134153        id : server_integration_tests_slow 
135154        if : ${{ (github.event.schedule || github.event.inputs.slow_tests == 'true') && matrix.build_type == 'Release' }} 
Original file line number Diff line number Diff line change @@ -89,6 +89,9 @@ def __init__(self):
8989            self .server_port  =  int (os .environ ["PORT" ])
9090
9191    def  start (self , timeout_seconds : int  =  10 ) ->  None :
92+         if  "LLAMA_SANITIZE"  in  os .environ :
93+             timeout_seconds  =  30 
94+ 
9295        if  "LLAMA_SERVER_BIN_PATH"  in  os .environ :
9396            server_path  =  os .environ ["LLAMA_SERVER_BIN_PATH" ]
9497        elif  os .name  ==  "nt" :
    
 
   
 
     
   
   
          
     
  
    
     
 
    
      
     
 
     
    You can’t perform that action at this time.
  
 
    
  
     
    
      
        
     
 
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments