Print this page 
NEX-13546 zfs-tests: stress tests need to be fixed after the merge (fix incremental)
NEX-13546 zfs-tests: stress tests need to be fixed after the merge
Reviewed by: Jean McCormack <jean.mccormack@nexenta.com>
Reviewed by: Steve Peng <steve.peng@nexenta.com>
NEX-2624 Integrate zfs stress tests
Split Close
Expand all
Collapse all
          --- old/usr/src/test/zfs-tests/tests/stress/Makefile
          +++ new/usr/src/test/zfs-tests/tests/stress/Makefile
↓ open down ↓ 2 lines elided ↑ open up ↑ 
   3    3  # Common Development and Distribution License ("CDDL"), version 1.0.
   4    4  # You may only use this file in accordance with the terms of version
   5    5  # 1.0 of the CDDL.
   6    6  #
   7    7  # A full copy of the text of the CDDL should have accompanied this
   8    8  # source.  A copy of the CDDL is also available via the Internet at
   9    9  # http://www.illumos.org/license/CDDL.
  10   10  #
  11   11  
  12   12  #
  13      -# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
       13 +# Copyright 2017 Nexenta Systems, Inc.
  14   14  #
  15   15  
  16      -include $(SRC)/test/zfs-tests/Makefile.com
  17      -include $(SRC)/test/Makefile.com
       16 +include         $(SRC)/Makefile.master
       17 +
       18 +ROOTOPTPKG=     $(ROOT)/opt/zfs-tests
       19 +TARGETDIR=      $(ROOTOPTPKG)/tests/stress
       20 +
       21 +include         $(SRC)/test/zfs-tests/Makefile.com
       22 +include         $(SRC)/test/Makefile.com
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX