Opened 8 years ago

Closed 8 years ago

#7316 closed defect (fixed)

nmake script for tests missing build targets

Reported by: ultramage Owned by:
Priority: Medium Milestone: Tor: 0.2.4.x-final
Component: Core Tor/Tor Version:
Severity: Keywords: msvc tor-client
Cc: Actual Points:
Parent ID: #7754 Points:
Reviewer: Sponsor:

Description

src/test/Makefile.nmake only builds test.exe and omits test-child.exe (required part of test.exe unit tests) and bench.exe (a set of benchmarks). The following patch fixes that:

  • src/test/Makefile.nmake

    diff --git a/src/test/Makefile.nmake b/src/test/Makefile.nmake
    index aec477c..8ab077a 100644
    a b  
    1 all: test.exe
     1all: test.exe test-child.exe bench.exe
    22
    33CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common /I ..\or
    44
    TEST_OBJECTS = test.obj test_addr.obj test_containers.obj \ 
    1616test.exe: $(TEST_OBJECTS)
    1717        $(CC) $(CFLAGS) $(LIBS) ..\common\*.lib $(TEST_OBJECTS)
    1818
     19test-child.exe: test-child.obj
     20        $(CC) test-child.obj
     21
     22bench.exe: bench.obj
     23        $(CC) bench.obj $(LIBS) ..\common\*.lib
     24
    1925clean:
    2026        del $(TEST_OBJECTS) *.lib test.exe

Child Tickets

Attachments (1)

patch-test-buildtargets-msvc.diff (638 bytes) - added by ultramage 8 years ago.

Download all attachments as: .zip

Change History (5)

Changed 8 years ago by ultramage

comment:1 Changed 8 years ago by nickm

Keywords: tor-client added
Milestone: Tor: 0.2.4.x-final
Status: newneeds_review

looks likely to be okay to me. just needs testing, a commit message, and a changes file.

comment:2 Changed 8 years ago by nickm

Parent ID: #7754

comment:3 Changed 8 years ago by nickm

This is in the 024_msvc branch.

comment:4 Changed 8 years ago by nickm

Resolution: fixed
Status: needs_reviewclosed

Merged a fix for this into master as of b998431a33db2b.

Note: See TracTickets for help on using tickets.